Fleshing out the workflow with more commands.

Plus a few bug fixes.