More tweaks to the Cakefile and some cleanup.