Partial clean-up after merge.

Merge from Moritz branch. Clean-up is still needed.

Refactor argument parsing + New commands

(0) -30 -10 -3 +3 +10 +30 tip

mercurial