Refinements to Upload CSV

See commit messages