Made some changes to allow for non-vehicle teleports