Lots of bug fixes and additional validation on the CSV process