Moving substation mapfixes onto dev-freeze

Also has a couple of very minor features but this is easier and faster than trying to get Gamer to rebase onto dev-freeze.