New command line options + improvements.

Preparations for use in LittleRunner.