cleanup
progress with leaflet use