I did some cleanup inside, and am working on decruftifying and simplifying things. See the UPDATES file for the important stuff, git changelog for details