Minor corrections to long-options.

Incorporates comments from Patrick (e.g., output-file to debug-file) and
some other minor corrections.