add wax, make mapbox terrain default again, refactor map.addLayers()
remove debug messages