NPC AI Improvements

NPC AI now behaves properly (though may still be imbalanced)