Map origin updated as well; limited waypoint support