Fixed parsers

Bug in CSV regex. Refactored.