More work on config options
Further config work