Add some default options, and move config.