Continued work on enabling command line options.

Optional and adjustable output via the command line is close. The main
file has also been tidied up and made more compliant with PBP.