fixed both teleports
Merge pull request #46 from dabeeya/master

fixed both teleports
fixed merge conflicts with teleportation fix