Feature/minor map mods