Lots of fidgety changes, bugfixing the cleaner utilities.