Lots of code cleanup and the rest of the work to implement a boilerplate Sorcery install.