bug fixes
increased size of integer type for waypoint ids