Expand commands

@vanicat, let me know if you have comments on any of the changes.