Third teleporter modifications/fixes