map tweaks
minor merge conflicts