update to leaflet 0.5, various cleanup