I have pretty much finished the cleanup and also added command line options. Multiple commits in the linux branch, but especially:
Had birtday on June 2 ;)
Will keep them up to date as the work progresses.
See next week's notes.