Some final tweaks to command lines and processing. Now does a complete
run.