Clean up
Fixed wrong bin number used for the layer
Using aerial images
Fixing various issues