Further tweaks to map generation