more improvements in the config