code cleanup and larger waypoint zone radius in case of incoming route traffic