Small optimisation tweaks

Probably not needed at all.
Finally fix scouting!

Don't let GoToNextLocation be called too often.
Random scouting changes