Cleaned up CombatService and fixed buff exceptions