Lots of Minor map fixes and a couple fixes