Added CmdGroup, and cosmetic cleanup.