Minors

minor improvements: Waypoints uses objects instead of arrays and Display uses Map instead of an Array