diff --git a/TheWarWithin/HunterMarksmanship.lua b/TheWarWithin/HunterMarksmanship.lua
index 93f9283be..26df44eaa 100644
--- a/TheWarWithin/HunterMarksmanship.lua
+++ b/TheWarWithin/HunterMarksmanship.lua
@@ -861,14 +861,14 @@ spec:RegisterAbilities( {
             return 2.5 * haste * ( buff.rapid_fire.up and 0.7 or 1 ) * ( buff.trueshot.up and 0.5 or 1 ) * ( buff.streamline.up and ( 1 - 0.15 * talent.streamline.rank ) or 1 )
         end,
         charges = 2,
-        cooldown = function () return haste * ( buff.trueshot.up and 4.8 or 12 ) * ( 1 - 0.1 * talent.tactical_reload.rank ) end,
-        recharge = function () return haste * ( buff.trueshot.up and 4.8 or 12 ) * ( 1 - 0.1 * talent.tactical_reload.rank ) end,
+        cooldown = function () return haste * 12 *( buff.trueshot.up and 0.3 or 1 ) * ( talent.tactical_reload.enabled and 0.9 or 1 ) end,
+        recharge = function () return haste * 12 *( buff.trueshot.up and 0.3 or 1 ) * ( talent.tactical_reload.enabled and 0.9 or 1 ) end,
         gcd = "spell",
         school = "physical",
 
         spend = function ()
             if buff.lock_and_load.up or buff.secrets_of_the_unblinking_vigil.up then return 0 end
-            return 35 * ( buff.trueshot.up and legendary.eagletalons_true_focus.enabled and 0.75 or 1 ) * ( buff.trueshot.up and ( 1 - 0.5 * talent.eagletalons_true_focus.rank ) or 1 )
+            return 35 * ( buff.trueshot.up and legendary.eagletalons_true_focus.enabled and 0.75 or 1 ) * ( buff.trueshot.up and ( talent.eagletalons_true_focus.enabled and 0.5  ) or 1 )
         end,
         spendType = "focus",
 
@@ -910,9 +910,9 @@ spec:RegisterAbilities( {
             if buff.lock_and_load.up then return 0 end
             return 2 * haste * ( buff.rapid_fire.up and 0.7 or 1 ) * ( buff.trueshot.up and 0.5 or 1 ) * ( buff.streamline.up and ( 1 - 0.15 * talent.streamline.rank ) or 1 )
         end,
-        cooldown = function () return haste * ( buff.trueshot.up and 4.8 or 12 ) * ( 1 - 0.1 * talent.tactical_reload.rank ) end,
+        cooldown = function () return haste * 12 *( buff.trueshot.up and 0.3 or 1 ) * ( talent.tactical_reload.enabled and 0.9 or 1 ) end,
         gcd = "spell",
-        school = "physical",
+        school = "shadow",
 
         spend = function ()
             if buff.lock_and_load.up or buff.secrets_of_the_unblinking_vigil.up then return 0 end
diff --git a/TheWarWithin/ShamanRestoration.lua b/TheWarWithin/ShamanRestoration.lua
index e01528d46..9eb241718 100644
--- a/TheWarWithin/ShamanRestoration.lua
+++ b/TheWarWithin/ShamanRestoration.lua
@@ -186,7 +186,7 @@ spec:RegisterAuras( {
     },
     downpour = {
         id = 462488,
-        duration = 10,
+        duration = 12,
         max_stack = 1
     },
     downpour_hot = {
@@ -660,9 +660,10 @@ spec:RegisterAbilities( {
         charges = function()
             if talent.healing_stream_totem.rank + talent.healing_stream_totem_2.rank > 1 then return 2 end
         end,
-        cooldown = 30,
-        recharge = function()
-            if talent.healing_stream_totem.rank + talent.healing_stream_totem_2.rank > 1 then return 30 end
+        cooldown = function () return 30 - ( talent.totemic_surge.enabled and 6 or 0 ) end,
+        recharge = function() 
+            if talent.healing_stream_totem.rank + talent.healing_stream_totem_2.rank > 1 then return ( 30 - talent.totemic_surge.enabled and 6 or 0 )
+            else return nil end
         end,
         gcd = "totem",
 
@@ -870,7 +871,7 @@ spec:RegisterAbilities( {
     riptide = {
         id = 61295,
         cast = 0,
-        charges = 2,
+        charges = function () return 2 + ( talent.elemental_reverb.enabled and 1 or 0 ) end,
         cooldown = 6,
         recharge = 6,
         gcd = "spell",
@@ -925,6 +926,7 @@ spec:RegisterAbilities( {
 
         handler = function ()
             summonTotem( "surging_totem" )
+            if talent.downpour.enabled then applyBuff( "downpour" ) end
         end,
 
         bind = { "healing_rain", "downpour" }