Shortcut aliases to CLI options added, default value quoting fixed