More work on improving config.