Reorganized Admin commands, added a few