Adding puppet-mode; disabling stupid 'guru' mode