Feature/minor map mods

Oh, cool.