bugfixes and productive config