yet more map tweaks