Updates to leaflet from @fperez's suggestions