More more stun improvements