survival hunter: various fixes

diff --git a/defaut/Chasseur.lua b/defaut/Chasseur.lua
index 9f968a0..b5a4731 100644
--- a/defaut/Chasseur.lua
+++ b/defaut/Chasseur.lua
@@ -54,13 +54,13 @@ ScoreSpells(FOCUSFIRE KILLCOMMAND ARCANESHOT KILLSHOT STEADYSHOT SERPENTSTING

 AddIcon help=main mastery=1
 {
+	if TargetLifePercent(less 20) Spell(KILLSHOT)
 	if Mana(less 40) {Spell(FERVOR) Spell(STEADYSHOT)}
 	if TargetBuffPresent(FRENZYEFFECT stacks=5 target=pet) Spell(FOCUSFIRE)
 	if CheckBoxOn(multi) Spell(MULTISHOT)
 	if TargetDebuffExpires(SERPENTSTING 0 mine=1) and TargetDeadIn(more 8) Spell(SERPENTSTING)
 	Spell(KILLCOMMAND)
 	Spell(ARCANESHOT)
-	if TargetLifePercent(less 20) Spell(KILLSHOT)
 	Spell(STEADYSHOT)
 }

@@ -79,16 +79,20 @@ AddIcon help=main mastery=2

 AddIcon help=main mastery=3
 {
-	if Mana(less 44) and BuffExpires(LOCKANDLOAD) Spell(STEADYSHOT)
-	if Mana(more 44) and TargetDebuffExpires(BLACKARROW 0 mine=1) Spell(BLACKARROW)
-	if Mana(more 24) and TargetDebuffExpires(SERPENTSTING 0 mine=1) and TargetDeadIn(more 8) Spell(SERPENTSTING)
-	if TargetDebuffExpires(EXPLOSIVESHOT 0 mine=1) Spell(EXPLOSIVESHOT)
-	if CheckBoxOn(multi) Spell(MULTISHOT)
-	if TargetLifePercent(less 20) Spell(KILLSHOT)
-	Spell(KILLCOMMAND)
-	unless 1.5s before Spell(EXPLOSIVESHOT) Spell(STEADYSHOT)
+    if TargetLifePercent(less 20) Spell(KILLSHOT)
+    if Mana(less 35) and BuffExpires(LOCKANDLOAD) Spell(STEADYSHOT)
+    if Mana(more 35) and TargetDebuffExpires(BLACKARROW 0 mine=1) Spell(BLACKARROW)
+    if Mana(more 25) and TargetDebuffExpires(SERPENTSTING 0 mine=1) and TargetDeadIn(more 8) Spell(SERPENTSTING)
+    if TargetDebuffExpires(EXPLOSIVESHOT 0 mine=1) Spell(EXPLOSIVESHOT)
+    if BuffPresent(LOCKANDLOAD) Spell (KILLCOMMAND)
+    if BuffPresent(LOCKANDLOAD) Spell (EXPLOSIVESHOT)
+    unless 1.5s before Spell(BLACKARROW) Spell(STEADYSHOT)
+    if CheckBoxOn(multi) Spell(MULTISHOT)
+    if Mana(more 57) Spell(ARCANESHOT)
+    unless 1.5s before Spell(EXPLOSIVESHOT) Spell(STEADYSHOT)
 }

+
 AddIcon help=cd
 {
 	unless BuffPresent(ASPECTOFTHEHAWK) Spell(ASPECTOFTHEHAWK)
diff --git a/defaut/Guerrier.lua b/defaut/Guerrier.lua
index e1e4537..b2996b4 100644
--- a/defaut/Guerrier.lua
+++ b/defaut/Guerrier.lua
@@ -43,7 +43,7 @@ Define(RAGINGBLOW 85288)
 	SpellInfo(RAGINGBLOW cd=6)
 Define(RECKLESSNESS 1719)
 Define(REND 772)
-	SpellAddTargetDebuff(REND REND=15)
+	SpellAddTargetDebuff(REND RENDDEBUFF=15)
 Define(RETALIATION 20230)
 Define(REVENGE 6572)
 	SpellInfo(REVENGE cd=5)
@@ -73,6 +73,7 @@ Define(TASTEFORBLOOD 56636)
 Define(ENRAGE 14202)
 Define(EXECUTIONER 90806)
 Define(SUNDERARMORDEBUFF 58567)
+Define(RENDDEBUFF 94009)

 #Talents
 Define(SLAMTALENT 2233)
@@ -96,7 +97,7 @@ AddIcon help=main mastery=1
 	if TargetDebuffExpires(SUNDERARMORDEBUFF 2 stacks=3) and CheckBoxOn(sunder) and TargetDebuffExpires(lowerarmor 2) Spell(SUNDERARMOR nored=1)

 	if Mana(less 20) Spell(DEADLYCALM)
-	if TargetDebuffExpires(REND) Spell(REND)
+	if TargetDebuffExpires(RENDDEBUFF) Spell(REND)
 	if CheckBoxOn(multi) Spell(BLADESTORM)
 	Spell(COLOSSUSSMASH)
 	Spell(MORTALSTRIKE)
@@ -133,7 +134,7 @@ AddIcon help=main mastery=3

 	if CheckBoxOn(multi)
 	{
-		if TargetDebuffExpires(REND mine=1) Spell(REND)
+		if TargetDebuffExpires(RENDDEBUFF mine=1) Spell(REND)
 		Spell(THUNDERCLAP)
 		Spell(SHOCKWAVE)
 	}
diff --git a/defaut/Mage.lua b/defaut/Mage.lua
index 0df49d7..586a5e1 100644
--- a/defaut/Mage.lua
+++ b/defaut/Mage.lua
@@ -39,7 +39,7 @@ Define(SUMMONWATERELEMENTAL 31687) #frost pet

 #Buff
 Define(BRAINFREEZE 57761) #frost (instant fireball/frostfire bolt)
-Define(FINGERSOFFROST 83074) #frost boost ice lance/deep freeze
+Define(FINGERSOFFROST 44544) #frost boost ice lance/deep freeze
 Define(HOTSTREAK 48108) #fire instant pyroblast
 Define(ARCANEBLASTDEBUFF 36032)