minor tweaks to map