Bugfixes. Adjusted config.