more config changes

Please rebase these changes to your PR