Fixed output formats, comments, output file names.