Add CtrlPFunky, improve indenting