variety of config changes/tweaks to fix previous 2 commits