Fixed Windows
Changed main map