Better csv upload, closes #92 and #93