+ config.ini; refactoring in progress