good progress on waypoint editing