minor fixes for warrior script

diff --git a/defaut/Guerrier.lua b/defaut/Guerrier.lua
index d98b8ad..b21ca36 100644
--- a/defaut/Guerrier.lua
+++ b/defaut/Guerrier.lua
@@ -51,6 +51,9 @@ Define(impending_victory 103840)
 Define(last_stand 12975)
   SpellInfo(last_stand duration=20 cd=180 )
   SpellAddBuff(last_stand last_stand=1)
+Define(meat_cleaver 85739)
+  SpellInfo(meat_cleaver duration=10 )
+  SpellAddBuff(meat_cleaver meat_cleaver=1)
 Define(mortal_strike 12294)
   SpellInfo(mortal_strike duration=10 rage=-10 cd=6 )
   SpellAddTargetDebuff(mortal_strike mortal_wounds=1)
@@ -195,6 +198,7 @@ AddIcon mastery=2 help=aoe

 	Spell(dragon_roar)
 	Spell(shockwave)
+	if BuffStacks(meat_cleaver) Spell(raging_blow)
 	Spell(whirlwind)
 	if Rage() >=90 Spell(cleave)
 	Spell(bloodthirst)
@@ -224,7 +228,7 @@ AddIcon mastery=3 help=offgcd
 	if target.IsInterruptible() Spell(pummel)
 	Spell(berserker_rage)
 	if BuffPresent(ultimatum) Spell(heroic_strike)
-	Spell(shield_block)
+	if BuffExpires(shield_block) Spell(shield_block)
 	if BuffExpires(shield_barrier) and Rage() >80 Spell(shield_barrier)
 	Spell(demoralizing_shout)
 }
@@ -234,7 +238,7 @@ AddIcon mastery=3 help=aoe
 	Spell(dragon_roar)
 	Spell(shockwave)
 	Spell(thunder_clap)
-	Spell(whirlwind)
+	if BuffPresent(ultimatum) Spell(cleave)
 	if Rage() >=90 Spell(cleave)
 	Spell(shield_slam)