add, clean: @3j cakefile stuff and minor improvements