Filename added to parser output, some cleanup and a look at residuals in model2. They do not look good.