updates to waypoint.h