CsvReader improvements

Handles quoted commas better