Fixed CSV processing, and cleaned up comments