add admin options & reformat some single-command ifs