added the choice of the model in the conf file, modified program accordingly