Bug fixes/AI Tweaking