improvements & fixes to the map