improve waypoint placement code
checkpoint
checkpoint