lots of cleanup and moving to more leaflet patterns