map tweaks and fixes