Bugfixes, modified the configuration file