Added/expanded commands, organized into groups