Tweaked configs and added intelligence