diff --git a/addons/GearSwap/beta_examples_and_information/Variables.xlsx b/addons/GearSwap/beta_examples_and_information/Variables.xlsx
index 4fca72aca..ebc19916e 100644
Binary files a/addons/GearSwap/beta_examples_and_information/Variables.xlsx and b/addons/GearSwap/beta_examples_and_information/Variables.xlsx differ
diff --git a/addons/GearSwap/gearswap.lua b/addons/GearSwap/gearswap.lua
index f913db5a9..c0ec11c9a 100644
--- a/addons/GearSwap/gearswap.lua
+++ b/addons/GearSwap/gearswap.lua
@@ -25,7 +25,7 @@
 --SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 _addon.name = 'GearSwap'
-_addon.version = '0.935'
+_addon.version = '0.936'
 _addon.author = 'Byrth'
 _addon.commands = {'gs','gearswap'}
 
diff --git a/addons/GearSwap/refresh.lua b/addons/GearSwap/refresh.lua
index ecff3754f..a2cfd028a 100644
--- a/addons/GearSwap/refresh.lua
+++ b/addons/GearSwap/refresh.lua
@@ -424,6 +424,7 @@ function weather_update(id)
     world.real_weather_id = id
     world.real_weather = res.weather[id][language]
     world.real_weather_element = res.elements[res.weather[id].element][language]
+    world.real_weather_intensity = res.weather[world.real_weather_id].intensity
     local buff = false
     if buffactive[178] then
         buff = true
@@ -471,6 +472,7 @@ function weather_update(id)
     end
     world.weather = res.weather[world.weather_id][language]
     world.weather_element = res.elements[res.weather[world.weather_id].element][language]
+    world.weather_intensity = res.weather[world.weather_id].intensity
 end
 
 
diff --git a/addons/checkparam/checkparam.lua b/addons/checkparam/checkparam.lua
index 6a72dd5e1..5b61cfa81 100644
--- a/addons/checkparam/checkparam.lua
+++ b/addons/checkparam/checkparam.lua
@@ -52,9 +52,9 @@ defaults = {
     SAM = 'store tp|double attack|triple attack|quadruple attack|weapon skill damage',
     NIN = 'store tp|double attack|triple attack|quadruple attack|subtle blow',
     DRG = 'store tp|double attack|triple attack|quadruple attack|weapon skill damage',
-    SMN = 'blood pact delay|blood pact delay ii|blood pact damage|avatar perpetuation cost|pet: magic attack bonus|pet: attack|pet: double attack|pet: accuracy|pet: magic accuracy|summoning magic skill|pet: blood pact damage|pet: magic damage',
-    BLU = 'store tp|double attack|triple attack|quadruple attack|critical hit rate|critical hit damage|weapon skill damage|fast cast|magic attack bonus|magic accuracy|cure potency',
-    COR = 'store tp|snapshot|rapid shot|fast cast|cure potency|magic accuracy|magic attack bonus|magic damage|weapon skill damage',
+    SMN = 'physical damage taken|magic damage taken|pet: physical damage taken|pet: magic damage taken|blood pact delay|blood pact delay ii|blood pact damage|avatar perpetuation cost|pet: magic attack bonus|pet: attack|pet: double attack|pet: accuracy|pet: magic accuracy|summoning magic skill|pet: blood pact damage|pet: magic damage',
+    BLU = 'physical damage taken|magic damage taken|haste|dual wield|store tp|double attack|triple attack|quadruple attack|critical hit rate|critical hit damage|weapon skill damage|fast cast|magic attack bonus|magic accuracy|cure potency',
+    COR = 'physical damage taken|magic damage taken|haste|dual wield|store tp|snapshot|rapid shot|fast cast|cure potency|magic accuracy|magic attack bonus|magic damage|weapon skill damage',
     PUP = 'pet: hp|pet: damage taken|pet: regen|martial arts|store tp|double attack|triple attack|quadruple attack',
     DNC = 'store tp|double attack|triple attack|quadruple attack',
     SCH = 'magic attack bonus|magic burst damage|magic burst damage ii|magic accuracy|magic damage|fast cast|elemental magic casting time|cure potency|enh mag eff dur|enhancing magic effect duration',
@@ -150,6 +150,9 @@ function split_text(id,text,arg)
         local key = arg and arg..key or key
         if key == "blood pact damage" then
             key = "pet: blood pact damage"
+        elseif key == "pet: damage taken" then
+            tbl['pet: physical damage taken'] = tonumber(value)+(tbl['pet: physical damage taken'] or 0)
+            tbl['pet: magic damage taken'] = tonumber(value)+(tbl['pet: magic damage taken'] or 0)
         elseif key == "damage taken" then
             tbl['physical damage taken'] = tonumber(value)+(tbl['physical damage taken'] or 0)
             tbl['magic damage taken'] = tonumber(value)+(tbl['magic damage taken'] or 0)
@@ -355,6 +358,8 @@ caps={
     ['quick cast']=10,
     ['physical damage taken']=-25,
     ['magic damage taken']=-25,
+    ['pet: physical damage taken']=-87.5,
+    ['pet: magic damage taken']=-87.5,
     ['pet: haste']=25,
     ['magic burst damage']=40,
     ['blood pact delay']=-15,