More fiddling. About done.

Regressions take more than half an hour to run which is a bit of a concern. Anyway I'm done with testing and will paste and write it up tomorrow and over the weekend.