leaflet and other improvements