Fix end to over teleporting and other minor things