locking done better during initialize but still suffering from upstream Leaflet bug -- see #5