improvements to configuration file handling