Adapted the main and the config file. New Makefile.