csv upload and fixes