> > I've shortened all of the lines to 80 max, as you asked - see attachment. 
> 
> Thank you.  Could you provide it as a patch?

Attached.