Map tweaks and additional maps