Some AWP/AWC enhancements.
More waypoints.