Major Teleportation Fixes