Correct inconsistency between comments and functions or command line fla...

...g default values.