configuration file handling slightly fixed and improved