updates to waypoint.cpp