Some additional updates based on CSV sample validation feedback from David Kipling.