Increased number of columns, improved error reporting
New test data from Mark