Updates from dev

shp and csv download, bugfixes. Fixes #192. Fixes #197