More AI Improvements