Correct return link for leaflet
Code cleanup
Apply meta data corrections