More work on config.