minor fixes and map tweaks