Changed system for teleportation and bug fixes