Small fixes and changes to the map