fix teleporting and timer