Still ain't perfect but hopefully better (still).

Would be useful to get feedback from CAOPS now.
https://redmine.ogf.org/dmsf_files/13021

Thanks

--jens

PS if there's time I may have another pass through it.