fixed more config
even more badly broken up changes in one commit