added integrated waypoint editor