Added back CSVParser
Removed more sign error stuff