Updated configuration options

...and their associated arguments.