Clean up map validation
Repush old stuff, mostly to clean up turn delays. Not finalized at all.