Feature/minor map mods

Yeah good point. I'll do some of that cleanup as part of the merge.