Tweaks to AI
Merged.