Did some work on handling too few/too many columns in data line