Waypointing and nave cleanup