Add comments. Remove unused command line options.