adding concentric circles to the map and general cleanup