more cakefile changes to make it nicer