Add in immunity timer for caby pet stun -- should not get stunned 5x in a row in a fight with NO immunity. This is nonsense.
If someone casts a spell on you and you resist it - DO NOT GET PUT INTO COMBAT. This makes bard amnesia an anytime "You're not going to stealth in the time it takes for my stun-debuff-nuke-nuke train to kill you in 0.0008 seconds". Seriously. If you resist a spell cast on you, it shouldn't put you into combat.