Improved City Map

Additional Small changes