Fill in command list. Fix a couple of usages while doing this.

3 files changed