E1S5: few map tweaks