Markers and popups working again. Using leaflet directly.