easier management of multiple maps, other tweaks