added config file + minor changes