Various changes to clean up code and images and allow editing the map and displaying water.