Modified commandline options, make -h, --help output useful