Fixed underscore/hyphen issues in command-line options; corrected warning messages