More fucking around with the waypoint behaviour and speed control, fucking fucking fuck.