fix up the commands
Merge branch 'commands'