Make Warrior much smarter, fixed some behaviors