Updates from dev

shp and csv download, bugfixes