Pkg fix, Cakefile fix, btn ctl fix