various map fixes and tweaks