more parameters in the config file + some cleaning