Improve teleport and add travelpoints support