Fixed a waypoint issue where a few were set to incorrect ages, also renamed a few waypoints for my use.