working on getting the map to be right