Added configuration file, fixed errors