CSV Upload Changes and Fixes