Bugfixes, config changes and CS fixes