more changes; added the waypoint loader