Did some fixes on the map generator