More minor fixes to the map

more stuff /tg/ left out of fixing.