Update TS versions

Also replaces a weird use of `.bind` that was causing issues with the update. I've tried to refactor the code to preseve the existing behavior