Small bugfixes, Config settings added