diff --git a/hero/alarak.json b/hero/alarak.json
index 8a139128..af860239 100644
--- a/hero/alarak.json
+++ b/hero/alarak.json
@@ -149,7 +149,7 @@
         "tooltipId": "AlarakNegativelyCharged",
         "talentTreeId": "AlarakNegativelyCharged",
         "name": "Negatively Charged",
-        "description": "Increase the Lightning Surge damage bonus to enemies between Alarak and his victim to 150%.  Repeatable Quest: Each Hero hit by the center of Lightning Surge permanently increases the damage bonus by 4%.",
+        "description": "Increase the Lightning Surge damage bonus to enemies between Alarak and his victim to 175%.  Repeatable Quest: Each Hero hit by the center of Lightning Surge permanently increases the damage bonus by 4%.",
         "icon": "storm_ui_icon_alarak_lightningsurge.png",
         "type": "E",
         "sort": 2,
diff --git a/hero/ana.json b/hero/ana.json
index 160d94f9..6e781f52 100644
--- a/hero/ana.json
+++ b/hero/ana.json
@@ -190,7 +190,7 @@
         "tooltipId": "AnaSleepDartNightTerrors",
         "talentTreeId": "AnaSleepDartNightTerrors",
         "name": "Night Terrors",
-        "description": "Gain 25% Movement Speed for 2 seconds for every Hero hit by Sleeping Dart. Upon waking, enemy Heroes take 10% of their Maximum Health in damage.",
+        "description": "Gain 25% Movement Speed for 2 seconds for every Hero hit by Sleep Dart. Upon waking, enemy Heroes take 10% of their Maximum Health in damage.",
         "icon": "storm_ui_icon_ana_sleep_dart.png",
         "type": "E",
         "sort": 2,
diff --git a/hero/cassia.json b/hero/cassia.json
index 6096171a..3dc8b214 100644
--- a/hero/cassia.json
+++ b/hero/cassia.json
@@ -197,7 +197,7 @@
         "tooltipId": "AmazonAvoidanceSurgeOfLight",
         "talentTreeId": "AmazonSurgeOfLight",
         "name": "Surge of Light",
-        "description": "After taking 500 (+4% per level) damage with Avoidance active, Cassia can activate Avoidance to deal 250 (+4% per level) damage to enemies around her.",
+        "description": "After taking 650 (+4% per level) damage with Avoidance active, Cassia can activate Avoidance to deal 240 (+4% per level) damage to enemies around her.",
         "icon": "storm_ui_icon_cassia_avoidance_b.png",
         "type": "Trait",
         "sort": 3,
diff --git a/hero/chromie.json b/hero/chromie.json
index b91c7728..a81a3be6 100644
--- a/hero/chromie.json
+++ b/hero/chromie.json
@@ -105,7 +105,7 @@
         "tooltipId": "ChromieDragonsBreathDeepBreathing",
         "talentTreeId": "ChromieDragonsBreathDeepBreathing",
         "name": "Deep Breathing",
-        "description": "Quest: Every time Dragon's Breath hits a Hero increase its damage by 1.5%, up to 30%.  Reward: After hitting 20 Heroes, reduce the cooldown of Dragon's Breath by 5 seconds and its Mana cost from 65 to 30.",
+        "description": "Quest: Every time Dragon's Breath hits a Hero increase its damage by 1%, up to 20%.  Reward: After hitting 20 Heroes, reduce the cooldown of Dragon's Breath by 4 seconds and its Mana cost from 65 to 40.",
         "icon": "storm_ui_icon_chromie_sandstrike.png",
         "type": "W",
         "sort": 2,
@@ -189,7 +189,7 @@
         "tooltipId": "ChromieDragonsBreathMobiusLoop",
         "talentTreeId": "ChromieDragonsBreathMobiusLoop",
         "name": "Mobius Loop",
-        "description": "Dragon's Breath deals 50% bonus damage to enemies hit by its center.  Enemy Heroes hit by its center are Slowed by 60% for 1 second.",
+        "description": "Dragon's Breath deals 30% bonus damage to enemies hit by its center.  Enemy Heroes hit by its center are Slowed by 60% for 0.75 seconds.",
         "icon": "storm_ui_icon_chromie_sandstrike.png",
         "type": "W",
         "sort": 2,
diff --git a/hero/deckard.json b/hero/deckard.json
index 54c089f1..ef062551 100644
--- a/hero/deckard.json
+++ b/hero/deckard.json
@@ -166,7 +166,7 @@
         "icon": "storm_ui_icon_deckard_ruby.png",
         "type": "Active",
         "sort": 3,
-        "cooldown": 10,
+        "cooldown": 20,
         "abilityId": "Deckard|Active",
         "abilityLinks": [
           "Deckard|W1"
diff --git a/hero/dva.json b/hero/dva.json
index bab2df02..4f25e9da 100644
--- a/hero/dva.json
+++ b/hero/dva.json
@@ -23,56 +23,56 @@
       {
         "uid": "dd269b",
         "name": "Boosters",
-        "description": "Increase D.Va's Movement Speed by 125% for 2 seconds. Enemies that are hit take 135 (+4% per level) damage and are knocked away.  D.Va cannot be Slowed while Boosters are active, and each enemy can only be hit once per use.",
+        "description": "Increase D.Va's Movement Speed by 115% for 1.75 seconds. Enemies that are hit take 135 (+4% per level) damage and are knocked away.  D.Va cannot be Slowed while Boosters are active, and each enemy can only be hit once per use.",
         "hotkey": "Q",
         "abilityId": "DVa|Q1",
-        "cooldown": 9,
+        "cooldown": 10,
         "icon": "storm_ui_icon_dva_boosters.png",
         "type": "basic"
       },
       {
         "uid": "040cda",
         "name": "Defense Matrix",
-        "description": "Channel a defensive field in the target direction for 3 seconds, reducing the damage dealt by enemy Heroes inside it by 75%. The Mech can move while channeling, but cannot turn.  Damage dealt to the Mech from enemies within Defense Matrix still grants the same amount of Self-Destruct Charge.",
+        "description": "Project a defensive field in the target direction for 3 seconds, reducing the damage dealt by enemy Heroes inside it by 50%.  Activate again to change the angle of projection.  Damage dealt to the Mech from enemies within Defense Matrix still grants the same amount of Self-Destruct Charge.",
         "hotkey": "W",
         "abilityId": "DVa|W1",
-        "cooldown": 10,
+        "cooldown": 12,
         "icon": "storm_ui_icon_dva_defensematrix.png",
         "type": "basic"
       },
       {
         "uid": "7cd57d",
         "name": "Self-Destruct",
-        "description": "Eject from the Mech, setting it to self-destruct after 4 seconds. Deals 1200 (+4% per level) to 400 (+4% per level) damage in a large area, depending on distance from center. Only deals 50% damage against Structures.  Gain 1% Charge for every 2 seconds spent Basic Attacking, and 30% Charge per 100% of Mech Health lost.",
+        "description": "Eject from the Mech, setting it to self-destruct after 4 seconds. Deals 400 (+4% per level) to 1100 (+4% per level) damage in a large area, depending on distance from center. Deals 50% damage against Structures.  Gain 1% Charge for every 2 seconds spent Basic Attacking, and 25% Charge per 100% of Mech Health lost.",
         "hotkey": "E",
         "abilityId": "DVa|E1",
         "icon": "storm_ui_icon_dva_selfdestruct.png",
         "type": "basic"
       },
       {
-        "uid": "0366da",
-        "name": "Big Shot",
-        "description": "Deal 250 (+4% per level) damage to all enemies in a line. The cooldown of Call Mech is reduced by 8 seconds for each enemy Hero hit.  Requires Pilot Mode.",
+        "uid": "2240d9",
+        "name": "Bunny Hop",
+        "description": "D.Va's Mech becomes Unstoppable and stomps every 0.5 seconds, dealing 52 (+4% per level) damage in a large area. Every 4th consecutive hit on a Hero deals 100% more damage and Stuns them for 0.5 seconds.  Lasts for 4 seconds.  Requires Mech Mode.",
         "hotkey": "R",
         "abilityId": "DVa|R1",
-        "cooldown": 4,
-        "icon": "storm_ui_icon_dva_bigshot.png",
+        "cooldown": 80,
+        "icon": "storm_ui_icon_dva_bunnyhop.png",
         "type": "heroic"
       },
       {
-        "uid": "2240d9",
-        "name": "Bunny Hop",
-        "description": "D.Va's Mech becomes Unstoppable and stomps every 0.5 seconds, dealing 60 (+4% per level) damage and Slowing enemies by 40%. Lasts 4 seconds.  Requires Mech Mode.",
+        "uid": "5da9f4",
+        "name": "Micro Missiles",
+        "description": "After .375 seconds, Channel to launch a volley of 12 missiles in a target direction. Each missile impacts the first enemy in its path, dealing 44 (+4% per level) damage in a small area and Slowing by 35% for 2 seconds.  Stores 2 charges with a 5 second cooldown between each use.  Requires Mech Mode.",
         "hotkey": "R",
         "abilityId": "DVa|R2",
-        "cooldown": 100,
-        "icon": "storm_ui_icon_dva_bunnyhop.png",
+        "cooldown": 20,
+        "icon": "storm_ui_icon_dva_micromissiles.png",
         "type": "heroic"
       },
       {
         "uid": "d32b79",
         "name": "Mech Mode",
-        "description": "When D.Va's Mech dies, she is ejected out after 0.75 seconds and can continue to fight. D.Va's Mech only awards 50% of a normal Hero's experience upon dying.",
+        "description": "When D.Va's Mech dies, she is ejected out after 0.75 seconds and can continue to fight. D.Va's Mech only awards 50% of a normal Hero's experience upon dying.  Fusion Cannons  D.Va's Mech Basic Attacks deal 23 (+4% per level) damage in a large area every 0.25 seconds. Deals 50% bonus damage against enemies very close to the Mech.",
         "trait": true,
         "abilityId": "DVa|D1",
         "icon": "storm_ui_icon_dva_mechmode.png",
@@ -81,7 +81,7 @@
       {
         "uid": "2269e2",
         "name": "Mechanized Walker",
-        "description": "While in her Mech, D.Va can shoot while moving, but her base Movement Speed is reduced by 15%.",
+        "description": "D.Va's Mech can shoot while moving. While shooting or channeling an ability, the Mech's Movement Speed is quickly reduced by 25%.",
         "hotkey": "Z",
         "abilityId": "DVa|Z1",
         "icon": "storm_ui_icon_dva_mount.png",
@@ -89,6 +89,15 @@
       }
     ],
     "D.VaPilot": [
+      {
+        "uid": "e0fee7",
+        "name": "Retarget Defense Matrix",
+        "description": "Retarget Defense Matrix",
+        "hotkey": "W",
+        "abilityId": "DVa|W2",
+        "icon": "storm_ui_icon_dva_defensematrix_a.png",
+        "type": "basic"
+      },
       {
         "uid": "64f1f0",
         "name": "Call Mech",
@@ -99,12 +108,21 @@
         "icon": "storm_ui_icon_dva_callmech.png",
         "type": "basic"
       },
+      {
+        "uid": "9efa22",
+        "name": "Cancel Defense Matrix",
+        "description": "Stop channeling Defense Matrix",
+        "trait": true,
+        "abilityId": "DVa|D2",
+        "icon": "hud_btn_bg_ability_cancel.png",
+        "type": "trait"
+      },
       {
         "uid": "c2a7b9",
         "name": "Pilot Mode",
         "description": "Basic Attacks reduce the cooldown of Call Mech by 0.5 seconds. As a Pilot, D.Va only awards 50% of a normal Hero's experience upon dying.",
         "trait": true,
-        "abilityId": "DVa|D2",
+        "abilityId": "DVa|D3",
         "icon": "storm_ui_icon_dva_pilotmode.png",
         "type": "trait"
       },
@@ -114,83 +132,73 @@
         "description": "Dash towards the target location, passing through enemies along the way.",
         "hotkey": "Q",
         "abilityId": "DVa|Q3",
-        "cooldown": 12,
+        "cooldown": 10,
         "icon": "storm_ui_icon_dva_jetpackattack.png",
         "type": "basic"
       },
       {
         "uid": "a9902a",
         "name": "Concussive Pulse",
-        "description": "Deal 141 (+4% per level) damage to enemies in a cone and knock them back.",
+        "description": "Deal 120 (+4% per level) damage to enemies in a cone and knock them back.",
         "hotkey": "W",
         "abilityId": "DVa|W3",
-        "cooldown": 7,
+        "cooldown": 10,
         "icon": "storm_ui_icon_dva_concussivecharge.png",
         "type": "basic"
       },
       {
-        "uid": "65869a",
-        "name": "Call Mech",
-        "description": "Call a new Mech and enter Mech Mode.  Basic Attacks lower this cooldown by 0.5 seconds each.",
-        "hotkey": "E",
-        "abilityId": "DVa|E3",
-        "cooldown": 45,
-        "icon": "storm_ui_icon_dva_callmech.png",
-        "type": "basic"
+        "uid": "0366da",
+        "name": "Big Shot",
+        "description": "Deal 150 (+4% per level) damage to all enemies in a line. Heroes hit have their Movement Speed Slowed by 25% for 1.5 seconds. The cooldown of Call Mech is reduced by 5 seconds for each enemy Hero hit.  Requires Pilot Mode.",
+        "hotkey": "R",
+        "abilityId": "DVa|R4",
+        "cooldown": 6,
+        "icon": "storm_ui_icon_dva_bigshot.png",
+        "type": "heroic"
       }
     ]
   },
   "talents": {
     "1": [
       {
-        "tooltipId": "DVaBoostersRushdown",
-        "talentTreeId": "DVaBoostersRushdown",
-        "name": "Rush-down",
-        "description": "If D.Va neither takes nor deals damage during Boosters, its cooldown is lowered by 7 seconds.",
-        "icon": "storm_ui_icon_dva_boosters.png",
-        "type": "Q",
+        "tooltipId": "DVaFullMetal",
+        "talentTreeId": "DVaFullMetal",
+        "name": "Full Metal",
+        "description": "D.Va's Mech gains 10% increased Health and its Fusion Cannons heal for 20% of the damage dealt to enemies in its bonus area.",
+        "icon": "storm_ui_icon_dva_mechmode.png",
+        "type": "Trait",
         "sort": 1,
-        "abilityId": "DVa|Q1",
+        "abilityId": "DVa|D1",
         "abilityLinks": [
-          "DVa|Q1"
+          "DVa|D1",
+          "DVa|E2"
         ]
       },
       {
-        "tooltipId": "DVaBoostersHitTheNitrous",
-        "talentTreeId": "DVaBoostersHitTheNitrous",
-        "name": "Hit the Nitrous",
-        "description": "Initial speed bonus of Boosters is increased to 325%, then decays to normal boost speed over 0.5 seconds. During this time, Boosters deals 50% extra damage.",
-        "icon": "storm_ui_icon_dva_boosters_a.png",
-        "type": "Q",
+        "tooltipId": "DVaMechProMoves",
+        "talentTreeId": "DVaMechProMoves",
+        "name": "Pro Moves",
+        "description": "D.Va's Mech gains 2% Movement Speed and 2 Armor every time it takes damage, stacking up to 15 times. Stacks of this effect decay every 0.5 seconds.  Basic Attacks against enemy Heroes in Pilot Mode reduce the cooldown of Call Mech by 1 additional second.",
+        "icon": "storm_ui_icon_dva_mechmode_a.png",
+        "type": "Trait",
         "sort": 2,
-        "abilityId": "DVa|Q1",
+        "abilityId": "DVa|D1",
         "abilityLinks": [
-          "DVa|Q1"
+          "DVa|D1",
+          "DVa|D3",
+          "DVa|E2"
         ]
       },
       {
-        "tooltipId": "DVaBoostersCrashCourse",
-        "talentTreeId": "DVaBoostersCrashCourse",
-        "name": "Crash Course",
-        "description": "Quest: Damage enemy Heroes with Boosters.  Reward: After damaging 20 Heroes, each use of Boosters lowers its cooldown by 1 second per Hero hit.",
-        "icon": "storm_ui_icon_dva_boosters_b.png",
-        "type": "Q",
+        "tooltipId": "DVaLiquidCooling",
+        "talentTreeId": "DVaLiquidCooling",
+        "name": "Liquid Cooling",
+        "description": "Activate to gain the effects of Healing Fountain. Requires Mech Mode.  Passive: While in Mech Mode, Healing Fountain's cooldown is reduced to 50 seconds and its effects last 25% longer.",
+        "icon": "storm_ui_icon_dva_mechmode_b.png",
+        "type": "Active",
         "sort": 3,
-        "isQuest": true,
-        "abilityId": "DVa|Q1",
-        "abilityLinks": [
-          "DVa|Q1"
-        ]
-      },
-      {
-        "tooltipId": "DVaMechProMoves",
-        "talentTreeId": "DVaMechProMoves",
-        "name": "Pro Moves",
-        "description": "D.Va's Mech gains 2% Movement Speed for 1.5 seconds every time it takes damage, up to 30%.",
-        "icon": "storm_ui_icon_dva_mechmode.png",
-        "type": "Trait",
-        "sort": 4,
-        "abilityId": "DVa|D1",
+        "cooldown": 50,
+        "abilityId": "DVa|Active",
         "abilityLinks": [
           "DVa|D1"
         ]
@@ -198,24 +206,24 @@
     ],
     "4": [
       {
-        "tooltipId": "DVaDefenseMatrixDivertingPower",
-        "talentTreeId": "DVaDefenseMatrixDivertingPower",
-        "name": "Diverting Power",
-        "description": "The area of Defense Matrix is 100% wider and 25% longer, but D.Va's Movement Speed is reduced by 30% for the duration.",
-        "icon": "storm_ui_icon_dva_defensematrix.png",
-        "type": "W",
+        "tooltipId": "DVaBoostersRushdown",
+        "talentTreeId": "DVaBoostersRushdown",
+        "name": "Rush-down",
+        "description": "Boosters deals an additional 4% of maximum Health as damage to Heroes and heals D.Va's Mech for the damage dealt. Boosters deals 100% increased damage to non-Heroic enemies.",
+        "icon": "storm_ui_icon_dva_boosters.png",
+        "type": "Q",
         "sort": 1,
-        "abilityId": "DVa|W1",
+        "abilityId": "DVa|Q1",
         "abilityLinks": [
-          "DVa|W1"
+          "DVa|Q1"
         ]
       },
       {
-        "tooltipId": "DVaDefenseMatrixGetThroughThis",
-        "talentTreeId": "DVaDefenseMatrixGetThroughThis",
-        "name": "Get Through This!",
-        "description": "Increase the duration of Defense Matrix by 3 seconds.",
-        "icon": "storm_ui_icon_dva_defensematrix_a.png",
+        "tooltipId": "DVaDefenseMatrixAggressionMatrix",
+        "talentTreeId": "DVaDefenseMatrixAggressionMatrix",
+        "name": "Aggression Matrix",
+        "description": "Enemy Heroes within your Defense Matrix receive 30% less healing.  Passive: Basic Attacks against Heroes lower the cooldown of Defense Matrix by 0.125 seconds.",
+        "icon": "storm_ui_icon_dva_defensematrix.png",
         "type": "W",
         "sort": 2,
         "abilityId": "DVa|W1",
@@ -224,38 +232,26 @@
         ]
       },
       {
-        "tooltipId": "DVaDefenseMatrixFusionGenerator",
-        "talentTreeId": "DVaDefenseMatrixFusionGenerator",
-        "name": "Fusion Generator",
-        "description": "Every time an enemy Hero deals damage while inside Defense Matrix, D.Va's Self-Destruct Charge increases by 1%.  Max of 15% Charge gained per use.",
-        "icon": "storm_ui_icon_dva_defensematrix_b.png",
-        "type": "W",
-        "sort": 3,
-        "abilityId": "DVa|W1",
-        "abilityLinks": [
-          "DVa|W1"
-        ]
-      },
-      {
-        "tooltipId": "DVaSelfDestructBringItOn",
-        "talentTreeId": "DVaSelfDestructBringItOn",
-        "name": "Bring It On",
-        "description": "Self-Destruct's Charge amount gained from losing Mech Health is increased by 30%.",
+        "tooltipId": "DVaSelfDestructNuclearOption",
+        "talentTreeId": "DVaSelfDestructNuclearOption",
+        "name": "Nuclear Option",
+        "description": "Hitting your self-destructing Mech with Big Shot causes it to self-destruct 40% faster.  Passive: When Fusion Cannons deal bonus damage to an enemy Hero, gain 0.25 Self-Destruct Charge.",
         "icon": "storm_ui_icon_dva_selfdestruct.png",
         "type": "E",
-        "sort": 4,
+        "sort": 3,
         "abilityId": "DVa|E1",
         "abilityLinks": [
-          "DVa|E1"
+          "DVa|E1",
+          "DVa|R4"
         ]
       }
     ],
     "7": [
       {
-        "tooltipId": "DVaBoostersComingThrough",
-        "talentTreeId": "DVaBoostersComingThrough",
-        "name": "Coming Through",
-        "description": "Knockback distance of Boosters is increased by 100%.",
+        "tooltipId": "DvaGetOnThePoint",
+        "talentTreeId": "DvaGetOnThePoint",
+        "name": "Get On The Point!",
+        "description": "Casting Boosters grants nearby allies 20% Movement Speed for 2 seconds.  Passive: If D.Va has not taken damage in the last 3 seconds, Boosters' cooldown refreshes 100% faster.",
         "icon": "storm_ui_icon_dva_boosters.png",
         "type": "Q",
         "sort": 1,
@@ -265,43 +261,30 @@
         ]
       },
       {
-        "tooltipId": "DVaDefenseMatrixDazerZone",
-        "talentTreeId": "DVaDefenseMatrixDazerZone",
-        "name": "Dazer Zone",
-        "description": "Enemy Heroes affected by Defense Matrix are Slowed by 20%.",
-        "icon": "storm_ui_icon_dva_defensematrix.png",
-        "type": "W",
+        "tooltipId": "DVaBoostersHitTheNitrous",
+        "talentTreeId": "DVaBoostersHitTheNitrous",
+        "name": "Hit the Nitrous",
+        "description": "The initial speed bonus of Boosters is increased to 300%, then decays to normal boost speed over 0.5 seconds. During this time, Boosters Stuns for 0.5 seconds.",
+        "icon": "storm_ui_icon_dva_boosters_a.png",
+        "type": "Q",
         "sort": 2,
-        "abilityId": "DVa|W1",
+        "abilityId": "DVa|Q1",
         "abilityLinks": [
-          "DVa|W1"
+          "DVa|Q1"
         ]
       },
       {
-        "tooltipId": "DVaDefenseMatrixAggressionMatrix",
-        "talentTreeId": "DVaDefenseMatrixAggressionMatrix",
-        "name": "Aggression Matrix",
-        "description": "Basic Attacks in Mech Mode against Heroes lower the cooldown of Defense Matrix by 0.25 seconds.",
-        "icon": "storm_ui_icon_dva_defensematrix_a.png",
+        "tooltipId": "DVaDefenseMatrixFusionGenerator",
+        "talentTreeId": "DVaDefenseMatrixFusionGenerator",
+        "name": "Fusion Generator",
+        "description": "Every time an enemy Hero deals damage while inside Defense Matrix, D.Va's Self-Destruct Charge increases by 1%. Max of 20% Charge gained per use.  Passive: While at full Self-Destruct charge, Fusion Cannons' bonus damage is increased to 75%.",
+        "icon": "storm_ui_icon_dva_defensematrix.png",
         "type": "W",
         "sort": 3,
         "abilityId": "DVa|W1",
         "abilityLinks": [
           "DVa|W1"
         ]
-      },
-      {
-        "tooltipId": "DVaSelfDestructNuclearOption",
-        "talentTreeId": "DVaSelfDestructNuclearOption",
-        "name": "Nuclear Option",
-        "description": "Increase Self Destruct's detonation timer by 3 seconds. Detonation damage increased by 70%.  A new Mech can still be called after 4 seconds.",
-        "icon": "storm_ui_icon_dva_selfdestruct.png",
-        "type": "E",
-        "sort": 4,
-        "abilityId": "DVa|E1",
-        "abilityLinks": [
-          "DVa|E1"
-        ]
       }
     ],
     "10": [
@@ -309,122 +292,110 @@
         "tooltipId": "DVaBunnyHopOn",
         "talentTreeId": "DVaBunnyHop",
         "name": "Bunny Hop",
-        "description": "D.Va's Mech becomes Unstoppable and stomps every 0.5 seconds, dealing 60 (+4% per level) damage and Slowing enemies by 40%. Lasts 4 seconds.  Requires Mech Mode.",
+        "description": "D.Va's Mech becomes Unstoppable and stomps every 0.5 seconds, dealing 52 (+4% per level) damage in a large area. Every 4th consecutive hit on a Hero deals 100% more damage and Stuns them for 0.5 seconds.  Lasts for 4 seconds.  Requires Mech Mode.",
         "icon": "storm_ui_icon_dva_bunnyhop.png",
         "type": "Heroic",
         "sort": 1,
-        "cooldown": 100,
-        "abilityId": "DVa|R2",
+        "cooldown": 80,
+        "abilityId": "DVa|R1",
         "abilityLinks": [
-          "DVa|R2"
+          "DVa|R1"
         ]
       },
       {
-        "tooltipId": "DVaPilotBigShot",
-        "talentTreeId": "DVaBigShot",
-        "name": "Big Shot",
-        "description": "Deal 250 (+4% per level) damage to all enemies in a line. The cooldown of Call Mech is reduced by 8 seconds for each enemy Hero hit.  Requires Pilot Mode.",
-        "icon": "storm_ui_icon_dva_bigshot.png",
+        "tooltipId": "DVaMicroMissiles",
+        "talentTreeId": "DVaMicroMissiles",
+        "name": "Micro Missiles",
+        "description": "After .375 seconds, Channel to launch a volley of 12 missiles in a target direction. Each missile impacts the first enemy in its path, dealing 44 (+4% per level) damage in a small area and Slowing by 35% for 2 seconds.  Stores 2 charges with a 5 second cooldown between each use.  Requires Mech Mode.",
+        "icon": "storm_ui_icon_dva_micromissiles.png",
         "type": "Heroic",
         "sort": 2,
-        "cooldown": 4,
-        "abilityId": "DVa|R1",
+        "cooldown": 20,
+        "abilityId": "DVa|R2",
         "abilityLinks": [
-          "DVa|R1"
+          "DVa|R2"
         ]
       }
     ],
     "13": [
       {
-        "tooltipId": "DVaMechExpensivePlating",
-        "talentTreeId": "DVaMechExpensivePlating",
-        "name": "Expensive Plating",
-        "description": "Increase Mech Health by 20%, but also increase the cooldown of Call Mech by 15 seconds.  This does not decrease the amount of Self-Destruct Charge gained.",
-        "icon": "storm_ui_icon_dva_callmech.png",
-        "type": "E",
+        "tooltipId": "DVaTargetLocked",
+        "talentTreeId": "DVaTargetLocked",
+        "name": "Target Locked",
+        "description": "Enemy Heroes that remain in your Defense Matrix for 1.5 seconds have their Armor reduced by 15 and their Movement Speed reduced by 25% for 3 seconds.",
+        "icon": "storm_ui_icon_dva_defensematrix.png",
+        "type": "W",
         "sort": 1,
-        "abilityId": "DVa|D1",
+        "abilityId": "DVa|W1",
         "abilityLinks": [
-          "DVa|D1",
-          "DVa|E2",
-          "DVa|E3"
+          "DVa|W1"
         ]
       },
       {
-        "tooltipId": "DVaMechEmergencyShielding",
-        "talentTreeId": "DVaMechEmergencyShielding",
-        "name": "Emergency Shielding",
-        "description": "When D.Va's Mech would be destroyed, it instead gains a Shield that absorbs 210 (+4% per level) damage over 6 seconds.  This effect has a 15 second cooldown.",
-        "icon": "storm_ui_icon_dva_mechmode.png",
+        "tooltipId": "DVaGoodToGo",
+        "talentTreeId": "DVaGoodToGo",
+        "name": "Good To Go",
+        "description": "Pilot Mode: Unlocks the Torpedo Dash and Concussive Pulse abilities.  Torpedo Dash: Dash a short distance. 10 second cooldown.  Concussive Pulse: Deal 120 (+4% per level) damage to enemies in a cone and knock them back. 10 second cooldown.",
+        "icon": "storm_ui_icon_dva_pilotmode.png",
         "type": "Trait",
         "sort": 2,
-        "abilityId": "DVa|D1",
+        "abilityId": "DVa|D3",
         "abilityLinks": [
-          "DVa|D1"
+          "DVa|D3"
         ]
       },
       {
-        "tooltipId": "DVaMechAblativeArmor",
-        "talentTreeId": "DVaMechAblativeArmor",
-        "name": "Ablative Armor",
-        "description": "Damage against D.Va's Mech that would deal 4% or less of its maximum Health is reduced by 50%.  This does not decrease the amount of Self-Destruct Charge gained.",
-        "icon": "storm_ui_icon_dva_mechmode_a.png",
+        "tooltipId": "DVaBigShotPewPewPew",
+        "talentTreeId": "DVaBigShotPewPewPew",
+        "name": "Pew! Pew! Pew!",
+        "description": "Pilot Mode: Instead of a single shot, Big Shot fires 3 shots over 0.5 seconds. Each shot deals 75% damage.",
+        "icon": "storm_ui_icon_dva_bigshot.png",
         "type": "Trait",
         "sort": 3,
-        "abilityId": "DVa|D1",
+        "abilityId": "DVa|R4",
         "abilityLinks": [
-          "DVa|D1"
+          "DVa|R4"
         ]
       }
     ],
     "16": [
       {
-        "tooltipId": "DVaPilotTorpedoDashTalent",
-        "talentTreeId": "DVaPilotTorpedoDash",
-        "name": "Torpedo Dash",
-        "description": "D.Va gains the Torpedo Dash ability, allowing her to dash forward and pass through enemies.  Requires Pilot Mode.",
-        "icon": "storm_ui_icon_dva_jetpackattack.png",
+        "tooltipId": "DVaInForTheKill",
+        "talentTreeId": "DVaInForTheKill",
+        "name": "In For The Kill",
+        "description": "Casting Boosters grants a Shield equal to 10% of maximum life for 2.5 seconds. Each Enemy Hero hit by Boosters increases D.Va's Mech's Basic Attack damage by 10% for 5 seconds, stacking up to 5 times.",
+        "icon": "storm_ui_icon_dva_boosters.png",
         "type": "Q",
         "sort": 1,
-        "cooldown": 12
-      },
-      {
-        "tooltipId": "DVaPilotGGWP",
-        "talentTreeId": "DVaPilotGGWP",
-        "name": "GG, WP",
-        "description": "Increase Pilot Mode Basic Attack damage by 50%. Participating in a Takedown while in Pilot Mode instantly refreshes the cooldown of Call Mech.",
-        "icon": "storm_ui_icon_dva_pilotmode.png",
-        "type": "Trait",
-        "sort": 2,
-        "abilityId": "DVa|D2",
+        "abilityId": "DVa|Q1",
         "abilityLinks": [
-          "DVa|D2"
+          "DVa|Q1"
         ]
       },
       {
-        "tooltipId": "DVaPilotNanoweaveSuit",
-        "talentTreeId": "DVaPilotNanoweaveSuit",
-        "name": "Nanoweave Suit",
-        "description": "For 4 seconds after ejecting from her Mech, D.Va gains 50 Armor and her Basic Attacks grant 50% more cooldown reduction towards Call Mech.",
-        "icon": "storm_ui_icon_dva_pilotmode_a.png",
-        "type": "Trait",
-        "sort": 3,
-        "abilityId": "DVa|D2",
+        "tooltipId": "DVaDefenseMatrixDivertingPower",
+        "talentTreeId": "DVaDefenseMatrixDivertingPower",
+        "name": "Diverting Power",
+        "description": "Defense Matrix's area grows drastically in size and each time it reduces damage dealt to Heroes D.Va's Mech is healed for 35 (+4% per level) Health.",
+        "icon": "storm_ui_icon_dva_defensematrix.png",
+        "type": "W",
+        "sort": 2,
+        "abilityId": "DVa|W1",
         "abilityLinks": [
-          "DVa|D2"
+          "DVa|W1"
         ]
       },
       {
-        "tooltipId": "DVaPilotSuppressingFire",
-        "talentTreeId": "DVaPilotSuppressingFire",
-        "name": "Suppressing Fire",
-        "description": "Pilot Mode Basic Attacks have 20% increased range and Slow enemy Movement Speed by 20% for 2.5 seconds.",
-        "icon": "storm_ui_icon_dva_pilotmode_b.png",
+        "tooltipId": "DVaMechEmergencyShielding",
+        "talentTreeId": "DVaMechEmergencyShielding",
+        "name": "Emergency Shielding",
+        "description": "When D.Va's Mech would be destroyed, it instead gains a Shield that absorbs 280 (+4% per level) damage over 4 seconds.  This effect has a 30 second cooldown.",
+        "icon": "storm_ui_icon_dva_mechmode.png",
         "type": "Trait",
-        "sort": 4,
-        "abilityId": "DVa|D2",
+        "sort": 3,
+        "abilityId": "DVa|D1",
         "abilityLinks": [
-          "DVa|D2"
+          "DVa|D1"
         ]
       }
     ],
@@ -433,50 +404,53 @@
         "tooltipId": "DVaBunnyHopStopAndPop",
         "talentTreeId": "DVaBunnyHopStopAndPop",
         "name": "Stop and Pop",
-        "description": "Bunny Hop deals 200% more damage if D.Va isn't moving at the moment of impact.",
+        "description": "Bunny Hop's duration does not decay while D.Va's Mech is stationary.",
         "icon": "storm_ui_icon_dva_bunnyhop.png",
         "type": "Heroic",
         "sort": 1,
-        "abilityId": "DVa|R2",
+        "abilityId": "DVa|R1",
         "abilityLinks": [
-          "DVa|R2"
+          "DVa|R1"
         ]
       },
       {
-        "tooltipId": "DVaBigShotPewPewPew",
-        "talentTreeId": "DVaBigShotPewPewPew",
-        "name": "Pew! Pew! Pew!",
-        "description": "Instead of a single shot, Big Shot fires 3 shots over 0.5 seconds. Each shot deals 50% damage.",
-        "icon": "storm_ui_icon_dva_bigshot.png",
+        "tooltipId": "DVaTimingAttack",
+        "talentTreeId": "DVaTimingAttack",
+        "name": "Timing Attack",
+        "description": "Micro Missiles gains an additional charge. Each time Micro Missiles hits an enemy Hero, reduce its cooldown by 0.5 seconds and charge cooldown by 0.25 seconds.",
+        "icon": "storm_ui_icon_dva_micromissiles.png",
         "type": "Heroic",
         "sort": 2,
-        "abilityId": "DVa|R1",
+        "abilityId": "DVa|R2",
         "abilityLinks": [
-          "DVa|R1"
+          "DVa|E1",
+          "DVa|R2"
         ]
       },
       {
-        "tooltipId": "DVaPilotConcussivePulseTalent",
-        "talentTreeId": "DVaPilotConcussivePulse",
-        "name": "Concussive Pulse",
-        "description": "D.Va gains the Concussive Pulse ability, allowing her to deal 141 (+4% per level) damage to enemies in a cone and knock them back.  Requires Pilot Mode.",
-        "icon": "storm_ui_icon_dva_concussivecharge.png",
-        "type": "W",
+        "tooltipId": "DVaHeadshot",
+        "talentTreeId": "DVaHeadshot",
+        "name": "Headshot!",
+        "description": "Pilot Mode: Increase Big Shot's damage by 75% and reduce its cooldown by 2 seconds.",
+        "icon": "storm_ui_icon_dva_bigshot.png",
+        "type": "Trait",
         "sort": 3,
-        "cooldown": 7
+        "abilityId": "DVa|R4",
+        "abilityLinks": [
+          "DVa|R4"
+        ]
       },
       {
-        "tooltipId": "DVaPilotCallMechMEKAfallTalent",
-        "talentTreeId": "DVaPilotCallMechMEKAfall",
-        "name": "MEKAfall",
-        "description": "Call Mech is instant and can target a location. Upon landing, the Mech deals 202 (+4% per level) damage to enemies in the impact area.",
-        "icon": "storm_ui_icon_dva_callmech.png",
-        "type": "E",
+        "tooltipId": "DVaMechAblativeArmor",
+        "talentTreeId": "DVaMechAblativeArmor",
+        "name": "Ablative Armor",
+        "description": "45% of Spell damage dealt to D.Va's Mech is returned as healing over 4 seconds.",
+        "icon": "storm_ui_icon_dva_mechmode.png",
+        "type": "Trait",
         "sort": 4,
-        "cooldown": 45,
-        "abilityId": "DVa|E2",
+        "abilityId": "DVa|D1",
         "abilityLinks": [
-          "DVa|E2"
+          "DVa|D1"
         ]
       }
     ]
diff --git a/hero/etc.json b/hero/etc.json
index ece17105..fc5af1e9 100644
--- a/hero/etc.json
+++ b/hero/etc.json
@@ -262,7 +262,7 @@
         "tooltipId": "ETCEncoreTalent",
         "talentTreeId": "ETCMasteryEncore",
         "name": "Encore",
-        "description": "Face Melt leaves an Amp behind, which will knock enemies away again 2 seconds later.  Passive: Each enemy Hero hit by Face Melt or the Amp reduces your Heroic Ability cooldown by 8%.",
+        "description": "Face Melt leaves an Amp behind, which will knock enemies away again 2 seconds later.  Passive: Each enemy Hero hit by Face Melt or the Amp reduces your Heroic Ability cooldown by 6%.",
         "icon": "storm_ui_icon_etc_facemelt_a.png",
         "type": "W",
         "sort": 2,
diff --git a/hero/gazlowe.json b/hero/gazlowe.json
index 7082a4b2..2ac00478 100644
--- a/hero/gazlowe.json
+++ b/hero/gazlowe.json
@@ -7,8 +7,8 @@
   "cUnitId": "HeroTinker",
   "name": "Gazlowe",
   "icon": "gazlowe.png",
-  "role": "Specialist",
-  "expandedRole": "Melee Assassin",
+  "role": "Warrior",
+  "expandedRole": "Bruiser",
   "type": "Melee",
   "releaseDate": "2014-03-13",
   "releasePatch": "0.1.1.00000",
@@ -25,62 +25,57 @@
       {
         "uid": "c31436",
         "name": "Rock-It! Turret",
-        "description": "Creates a turret that deals 62 (+4% per level) damage. Lasts for 30 seconds.  Stores up to 2 charges.",
+        "description": "Create a turret that deals 36 (+4% per level) damage. Lasts for 15 seconds.  Turrets prioritize the nearest enemy Hero when first created.",
         "hotkey": "Q",
         "abilityId": "Gazlowe|Q1",
-        "cooldown": 15,
-        "manaCost": 70,
+        "manaCost": 4,
         "icon": "storm_ui_icon_gazlowe_rockitturret.png",
         "type": "basic"
       },
       {
-        "uid": "8a7b6e",
+        "uid": "3ba3a2",
         "name": "Deth Lazor",
-        "description": "Charged attack that deals 137 (+4% per level) damage to enemies in a line. Damage and range increase the longer the Ability is charged, up to 100% after 3 seconds.  Deth Lazor can be channeled indefinitely.",
+        "description": "After 0.65 seconds, deal 174 (+4% per level) damage to enemies in a line. Heal for 25% of the damage dealt, increased to 75% against enemy Heroes.",
         "hotkey": "W",
         "abilityId": "Gazlowe|W1",
-        "cooldown": 12,
-        "manaCost": 60,
+        "cooldown": 8,
         "icon": "storm_ui_icon_gazlowe_dethlazor.png",
         "type": "basic"
       },
       {
         "uid": "8f8fb4",
         "name": "Xplodium Charge",
-        "description": "Places a bomb that deals 233 (+4% per level) damage to enemies within target area after 2.5 seconds, stunning them for 1.75 seconds.",
+        "description": "Place a bomb that deals 155 (+4% per level) damage to enemies within the target area after 1.25 seconds.  Enemies hit are also Stunned for 1 second.",
         "hotkey": "E",
         "abilityId": "Gazlowe|E1",
-        "cooldown": 14,
-        "manaCost": 60,
+        "cooldown": 12,
         "icon": "storm_ui_icon_gazlowe_explodiumcharge.png",
         "type": "basic"
       },
       {
-        "uid": "0de520",
-        "name": "Grav-O-Bomb 3000",
-        "description": "After a 2 second delay, pull enemies toward the center of an area and deal 251 (+4% per level) damage.",
+        "uid": "5a140f",
+        "name": "Robo-Goblin",
+        "description": "Activate to become Unstoppable for 1.5 seconds.  Passive: Basic Attacks deal 80 (+4% per level) bonus damage over 5 seconds, stacking up to 3 times.",
         "hotkey": "R",
         "abilityId": "Gazlowe|R1",
-        "cooldown": 90,
-        "manaCost": 80,
-        "icon": "storm_ui_icon_gazlowe_gravobomb.png",
+        "cooldown": 40,
+        "icon": "storm_ui_icon_gazlowe_robogoblin.png",
         "type": "heroic"
       },
       {
-        "uid": "5a140f",
-        "name": "Robo-Goblin",
-        "description": "Activate to gain 40 Armor and 30% Movement Speed for 4 seconds.  Passive: Basic Attacks deal 100% bonus damage.",
+        "uid": "0de520",
+        "name": "Grav-O-Bomb 3000",
+        "description": "After a 1.5 second delay, pull enemies toward the center of an area and deal 220 (+4% per level) damage. Basic Abilities deal 30% more damage for 5 seconds after casting Grav-O-Bomb 3000.",
         "hotkey": "R",
         "abilityId": "Gazlowe|R2",
         "cooldown": 60,
-        "icon": "storm_ui_icon_gazlowe_robogoblin.png",
+        "icon": "storm_ui_icon_gazlowe_gravobomb.png",
         "type": "heroic"
       },
       {
-        "uid": "0bdf5b",
-        "name": "Salvager",
-        "description": "Destroyed enemy Structures and Rock-it! Turrets drop Scrap. Collecting Scrap restores 30 Mana and causes Abilities to recharge three times as fast over 3 seconds.  Activate Salvager to dismantle a target Rock-it! Turret and turn it into Scrap.",
-        "hotkey": "D",
+        "uid": "272b17",
+        "name": "Reduce, Reuse, Recycle",
+        "description": "Regenerate 1 Scrap every 4 seconds. Destroyed Rock-It! Turrets drop 1 Scrap, which can be picked up.  Activate to destroy a target Rock-It! Turret.",
         "trait": true,
         "abilityId": "Gazlowe|D1",
         "icon": "storm_ui_icon_gazlowe_salvager.png",
@@ -101,10 +96,10 @@
   "talents": {
     "1": [
       {
-        "tooltipId": "TinkerXplodiumChargeExtraTNTTalent",
-        "talentTreeId": "TinkerMasteryExtraTNT",
-        "name": "Extra TNT",
-        "description": "Increases Xplodium Charge damage by 10% per target hit, up to 100%.",
+        "tooltipId": "GazloweXplodiumChargeRocketBoots",
+        "talentTreeId": "GazloweXplodiumChargeRocketBoots",
+        "name": "Rocket Boots",
+        "description": "Increase the cast range of Xplodium Charge by 30% and its damage by 20%. Hitting an enemy Hero increases Movement Speed by 20% for 3 seconds.",
         "icon": "storm_ui_icon_gazlowe_explodiumcharge.png",
         "type": "E",
         "sort": 1,
@@ -114,10 +109,10 @@
         ]
       },
       {
-        "tooltipId": "TinkerSalvagerScrapOMaticSmelterTalent",
-        "talentTreeId": "TinkerCombatStyleScrapoMaticSmelter",
-        "name": "Scrap-o-Matic Smelter",
-        "description": "Increases the Mana restored from Scrap by 100%.",
+        "tooltipId": "GazloweBigGameHunter",
+        "talentTreeId": "GazloweBigGameHunter",
+        "name": "Big Game Hunter",
+        "description": "Increase maximum Scrap by 2.  Dealing damage with Basic Attacks to enemy Heroes, Mercenaries, or Monsters reduces the cooldown of Reduce, Reuse, Recycle by 2 seconds.",
         "icon": "storm_ui_icon_gazlowe_salvager.png",
         "type": "Trait",
         "sort": 2,
@@ -127,119 +122,98 @@
         ]
       },
       {
-        "tooltipId": "TinkerSalvagerBreakItDownTalent",
-        "talentTreeId": "TinkerCombatStyleBreakitDown",
-        "name": "Break it Down!",
-        "description": "Scrap causes Abilities to cooldown four times as fast for 3 seconds.",
-        "icon": "storm_ui_icon_gazlowe_salvager_var1.png",
-        "type": "Trait",
+        "tooltipId": "GazloweOneManWreckingCrew",
+        "talentTreeId": "GazloweOneManWreckingCrew",
+        "name": "One Man Wrecking Crew",
+        "description": "Casting Basic Abilities cause Gazlowe's next Basic Attack within 6 seconds to deal 45% more damage.  Stores up to 2 charges.",
+        "icon": "storm_ui_icon_talent_autoattack_damage.png",
+        "type": "Passive",
         "sort": 3,
-        "abilityId": "Gazlowe|D1",
+        "abilityId": "Gazlowe|Passive",
         "abilityLinks": [
           "Gazlowe|D1"
         ]
-      },
-      {
-        "tooltipId": "TinkerGoblinRepairs",
-        "talentTreeId": "TinkerGoblinRepairs",
-        "name": "Goblin Repairs",
-        "description": "Quest: Gathering a Regeneration Globe increases Health Regeneration by 1 per second, up to 25.  Reward: After gathering 25 Globes, gain an additional 15 Health Regeneration per second.",
-        "icon": "storm_ui_icon_talent_regenerationmaster.png",
-        "type": "Passive",
-        "sort": 4,
-        "isQuest": true,
-        "abilityId": "Gazlowe|Passive"
       }
     ],
     "4": [
       {
-        "tooltipId": "TinkerRockItTurretClockwerkSteamFistsTalent",
-        "talentTreeId": "TinkerCombatStyleClockwerkSteamFists",
-        "name": "Clockwerk Steam Fists",
-        "description": "Quest: Basic Attacks increase the duration of active Rock-It! Turrets by 1.5 seconds.  Reward: After increasing turret duration by 600 total seconds, reduce the charge cooldown of Rock-It! Turret by 3 seconds.",
+        "tooltipId": "GazloweRockItSockIt",
+        "talentTreeId": "GazloweRockItSockIt",
+        "name": "Rock It Sock It",
+        "description": "Casting Rock-It! Turret grants Gazlowe a Shield that absorbs up to 215 (+4% per level) damage for 2.5 seconds.",
         "icon": "storm_ui_icon_gazlowe_rockitturret.png",
         "type": "Q",
         "sort": 1,
-        "isQuest": true,
         "abilityId": "Gazlowe|Q1",
         "abilityLinks": [
           "Gazlowe|Q1"
         ]
       },
       {
-        "tooltipId": "TinkerARKReaktor",
-        "talentTreeId": "TinkerMasteryARKReaktor",
-        "name": "ARK Reaktor",
-        "description": "Reduces Xplodium Charge's cooldown by 2 seconds.  If Xplodium Charge hits an enemy Hero, gain 2 charges of Rock-It! Turret.",
-        "icon": "storm_ui_icon_gazlowe_explodiumcharge.png",
-        "type": "E",
+        "tooltipId": "GazloweHyperfocusCoils",
+        "talentTreeId": "GazloweHyperfocusCoils",
+        "name": "Hyperfocus Coils",
+        "description": "Heroes hit by Deth Lazor or Xplodium Charge take an additional 2% of their maximum Health in damage. Gazlowe is healed for 150% of the damage dealt.",
+        "icon": "storm_ui_icon_gazlowe_combo_w_e.png",
+        "type": "Passive",
         "sort": 2,
-        "abilityId": "Gazlowe|E1",
+        "abilityId": "Gazlowe|Passive",
         "abilityLinks": [
-          "Gazlowe|E1"
+          "Gazlowe|E1",
+          "Gazlowe|W1"
         ]
       },
       {
-        "tooltipId": "TinkerSalvagerReduceReuseRecycleTalent",
-        "talentTreeId": "TinkerCombatStyleReduceReuseRecycle",
-        "name": "Reduce, Reuse, Recycle",
-        "description": "Enemy Minions that die nearby have a 15% chance to drop Scrap.",
-        "icon": "storm_ui_icon_gazlowe_salvager.png",
-        "type": "Trait",
+        "tooltipId": "TinkerDethLazorEZPZDimensionalRipperTalent",
+        "talentTreeId": "TinkerMasteryEZPZDimensionalRipper",
+        "name": "EZ-PZ Dimensional Ripper",
+        "description": "Activate to gain 35 Armor for 3 seconds, reducing damage taken by 35%, and reduce damage dealt by all nearby enemy Heroes and Summons by 50% for 3 seconds",
+        "icon": "storm_ui_icon_talent_imposingpresence.png",
+        "type": "Active",
         "sort": 3,
-        "abilityId": "Gazlowe|D1",
-        "abilityLinks": [
-          "Gazlowe|D1"
-        ]
-      },
-      {
-        "tooltipId": "TinkerHiredGoons",
-        "talentTreeId": "TinkerHiredGoons",
-        "name": "Hired Goons",
-        "description": "Friendly non-Boss Mercenaries near Gazlowe deal 50% more damage. Rock-it! Turrets gain 50 Armor against Minions and Mercenaries, reducing their damage taken by 50%.",
-        "icon": "storm_ui_icon_talent_mercenarylord.png",
-        "type": "Passive",
-        "sort": 4,
-        "abilityId": "Gazlowe|Passive"
+        "cooldown": 40,
+        "abilityId": "Gazlowe|Active"
       }
     ],
     "7": [
       {
-        "tooltipId": "TinkerRockItTurretRockItTurretXLTalent",
-        "talentTreeId": "TinkerMasteryRockitTurretXL",
-        "name": "Rock-It! Turret XL",
-        "description": "Rock-It! Turrets attack up to 2 additional enemies for 60% damage.",
-        "icon": "storm_ui_icon_gazlowe_rockitturret.png",
+        "tooltipId": "GazloweDethLazorGoblinFusionTalent",
+        "talentTreeId": "TinkerMasteryGoblinFusion",
+        "name": "Goblin Fusion",
+        "description": "Generate 3 Scrap for each Hero hit by Deth Lazor.",
+        "icon": "storm_ui_icon_gazlowe_combo_q_w.png",
         "type": "Q",
         "sort": 1,
         "abilityId": "Gazlowe|Q1",
         "abilityLinks": [
-          "Gazlowe|Q1"
+          "Gazlowe|Q1",
+          "Gazlowe|W1"
         ]
       },
       {
-        "tooltipId": "TinkerRockItTurretEngineGunkTalent",
-        "talentTreeId": "TinkerMasteryEngineGunk",
-        "name": "Engine Gunk",
-        "description": "Rock-It! Turret attacks Slow enemies by 20% for 2 seconds.",
-        "icon": "storm_ui_icon_gazlowe_rockitturret_var1.png",
-        "type": "Q",
+        "tooltipId": "GazloweOverload",
+        "talentTreeId": "GazloweOverload",
+        "name": "Overload",
+        "description": "Deth Lazor can now store up to 2 charges. Each enemy Hero hit by Deth Lazor reduces its cooldown by 0.5 seconds.",
+        "icon": "storm_ui_icon_gazlowe_dethlazor_a.png",
+        "type": "W",
         "sort": 2,
-        "abilityId": "Gazlowe|Q1",
+        "abilityId": "Gazlowe|W1",
         "abilityLinks": [
-          "Gazlowe|Q1"
+          "Gazlowe|W1"
         ]
       },
       {
-        "tooltipId": "TinkerDethLazorHyperfocusCoilsTalent",
-        "talentTreeId": "TinkerMasteryHyperfocusCoils",
-        "name": "Hyperfocus Coils",
-        "description": "The mana cost of Deth Lazor is reduced by 30 and it charges twice as fast.",
-        "icon": "storm_ui_icon_gazlowe_dethlazor.png",
-        "type": "W",
+        "tooltipId": "GazloweMasterBlaster",
+        "talentTreeId": "GazloweMasterBlaster",
+        "name": "Master Blaster",
+        "description": "Deth Lazor and Xplodium Charge Slow enemies hit by 35% for 2.5 seconds. Rock-It! Turret Basic Attacks against enemies Slowed in this way extend the Slow duration by 0.25 seconds.",
+        "icon": "storm_ui_icon_gazlowe_combo_w_e.png",
+        "type": "Passive",
         "sort": 3,
-        "abilityId": "Gazlowe|W1",
+        "abilityId": "Gazlowe|Passive",
         "abilityLinks": [
+          "Gazlowe|E1",
           "Gazlowe|W1"
         ]
       }
@@ -249,110 +223,110 @@
         "tooltipId": "TinkerRoboGoblinPassive",
         "talentTreeId": "TinkerHeroicAbilityRoboGoblin",
         "name": "Robo-Goblin",
-        "description": "Activate to gain 40 Armor and 30% Movement Speed for 4 seconds.  Passive: Basic Attacks deal 100% bonus damage.",
+        "description": "Activate to become Unstoppable for 1.5 seconds.  Passive: Basic Attacks deal 80 (+4% per level) bonus damage over 5 seconds, stacking up to 3 times.",
         "icon": "storm_ui_icon_gazlowe_robogoblin.png",
         "type": "Heroic",
         "sort": 1,
-        "cooldown": 60,
-        "abilityId": "Gazlowe|R2",
+        "cooldown": 40,
+        "abilityId": "Gazlowe|R1",
         "abilityLinks": [
-          "Gazlowe|R2"
+          "Gazlowe|R1"
         ]
       },
       {
         "tooltipId": "TinkerGravOBomb3000",
         "talentTreeId": "TinkerHeroicAbilityGravOBomb3000",
         "name": "Grav-O-Bomb 3000",
-        "description": "After a 2 second delay, pull enemies toward the center of an area and deal 251 (+4% per level) damage.",
+        "description": "After a 1.5 second delay, pull enemies toward the center of an area and deal 220 (+4% per level) damage. Basic Abilities deal 30% more damage for 5 seconds after casting Grav-O-Bomb 3000.",
         "icon": "storm_ui_icon_gazlowe_gravobomb.png",
         "type": "Heroic",
         "sort": 2,
-        "cooldown": 90,
-        "abilityId": "Gazlowe|R1",
+        "cooldown": 60,
+        "abilityId": "Gazlowe|R2",
         "abilityLinks": [
-          "Gazlowe|R1"
+          "Gazlowe|R2"
         ]
       }
     ],
     "13": [
       {
-        "tooltipId": "TinkerDethLazorEZPZDimensionalRipperTalent",
-        "talentTreeId": "TinkerMasteryEZPZDimensionalRipper",
-        "name": "EZ-PZ Dimensional Ripper",
-        "description": "Deth Lazor Slows Heroes by 50% and Stuns non-Heroes for 3 seconds.",
-        "icon": "storm_ui_icon_gazlowe_dethlazor.png",
-        "type": "W",
+        "tooltipId": "GazloweRockItTurretPositiveReinforcement",
+        "talentTreeId": "GazloweRockItTurretPositiveReinforcement",
+        "name": "Positive Reinforcement",
+        "description": "Primary Rock-It! Turret attacks against Heroes increase Gazlowe's Attack Speed by 40% for 3 seconds.",
+        "icon": "storm_ui_icon_gazlowe_rockitturret.png",
+        "type": "Q",
         "sort": 1,
-        "abilityId": "Gazlowe|W1",
+        "abilityId": "Gazlowe|Q1",
         "abilityLinks": [
-          "Gazlowe|W1"
+          "Gazlowe|Q1"
         ]
       },
       {
-        "tooltipId": "TinkerDethLazorGoblinFusionTalent",
-        "talentTreeId": "TinkerMasteryGoblinFusion",
-        "name": "Goblin Fusion",
-        "description": "Deth Lazor can be charged for 1 additional second to increase its damage bonus by an additional 100%.",
-        "icon": "storm_ui_icon_gazlowe_dethlazor_a.png",
-        "type": "W",
+        "tooltipId": "GazloweRockItTurretSuperiorSchematics",
+        "talentTreeId": "GazloweRockItTurretSuperiorSchematics",
+        "name": "Superior Schematics",
+        "description": "Rock-It! Turrets attack up to 2 additional enemies for 75% damage and have 50% increased Basic Attack range.",
+        "icon": "storm_ui_icon_gazlowe_rockitturret_var1.png",
+        "type": "Q",
         "sort": 2,
-        "abilityId": "Gazlowe|W1",
+        "abilityId": "Gazlowe|Q1",
         "abilityLinks": [
-          "Gazlowe|W1"
+          "Gazlowe|Q1"
         ]
       },
       {
-        "tooltipId": "TinkerXplodiumChargeXtraLargeBombsTalent",
-        "talentTreeId": "TinkerMasteryXTraLargeBombs",
-        "name": "X-Tra Large Bombs",
-        "description": "Increases Xplodium Charge radius by 30%. Being stunned or rooted causes an Xplodium Charge to drop at Gazlowe's feet.  This effect has a 10 second cooldown.",
-        "icon": "storm_ui_icon_gazlowe_explodiumcharge.png",
-        "type": "E",
+        "tooltipId": "GazloweRockItTurretOverchargedCapacitors",
+        "talentTreeId": "GazloweRockItTurretOverchargedCapacitors",
+        "name": "Overcharged Capacitors",
+        "description": "Gazlowe gains 5% Spell Power for each active Rock-It! Turret, up to a maximum of 15%. Dealing Basic Attack damage extends the duration of Rock-It! Turrets by 1.25 seconds.",
+        "icon": "storm_ui_icon_gazlowe_rockitturret_var2.png",
+        "type": "Q",
         "sort": 3,
-        "abilityId": "Gazlowe|E1",
+        "abilityId": "Gazlowe|Q1",
         "abilityLinks": [
-          "Gazlowe|E1"
+          "Gazlowe|Q1"
         ]
       }
     ],
     "16": [
       {
-        "tooltipId": "TinkerRockItTurretTurretStorageTalent",
-        "talentTreeId": "TinkerMasteryTurretStorage",
-        "name": "Turret Storage",
-        "description": "Increases Rock-It! Turret maximum charges from 2 to 3.",
-        "icon": "storm_ui_icon_gazlowe_rockitturret.png",
-        "type": "Q",
+        "tooltipId": "GazloweDethLazorFirinMahLazorz",
+        "talentTreeId": "GazloweDethLazorFirinMahLazorz",
+        "name": "Firin' Mah Lazorz",
+        "description": "Firing Deth Lazor causes all of Gazlowe's Rock-It! Turrets to fire a Deth Lazor of their own that deals 125 (+4% per level) damage.",
+        "icon": "storm_ui_icon_gazlowe_dethlazor.png",
+        "type": "W",
         "sort": 1,
-        "abilityId": "Gazlowe|Q1",
+        "abilityId": "Gazlowe|W1",
         "abilityLinks": [
-          "Gazlowe|Q1"
+          "Gazlowe|W1"
         ]
       },
       {
-        "tooltipId": "TinkerSuperiorSchematics",
-        "talentTreeId": "TinkerSuperiorSchematics",
-        "name": "Superior Schematics",
-        "description": "Gazlowe's Rock-It! Turrets have 25% increased range while he is within their attack range.",
-        "icon": "storm_ui_icon_gazlowe_rockitturret_var1.png",
-        "type": "Q",
+        "tooltipId": "GazloweXplodiumChargeArkReaktor",
+        "talentTreeId": "GazloweXplodiumChargeArkReaktor",
+        "name": "Ark Reaktor",
+        "description": "Reduce the cooldown of Xplodium Charge by 3 seconds. Casting Xplodium Charge creates 3 miniature Rock-It! Turrets that last for 3 seconds.  These Turrets do not drop Scrap or benefit from other Talents.",
+        "icon": "storm_ui_icon_gazlowe_explodiumcharge.png",
+        "type": "E",
         "sort": 2,
-        "abilityId": "Gazlowe|Q1",
+        "abilityId": "Gazlowe|E1",
         "abilityLinks": [
-          "Gazlowe|Q1"
+          "Gazlowe|E1"
         ]
       },
       {
-        "tooltipId": "TinkerXplodiumChargeKwikReleaseChargeTalent",
-        "talentTreeId": "TinkerMasteryQuikReleaseCharge",
-        "name": "Kwik Release Charge",
-        "description": "Xplodium Charge gains a second charge.",
-        "icon": "storm_ui_icon_gazlowe_explodiumcharge.png",
-        "type": "E",
+        "tooltipId": "GazloweOverklock",
+        "talentTreeId": "GazloweOverklock",
+        "name": "Overklock",
+        "description": "Basic Attacks grant Gazlowe 15% Movement Speed for 2 seconds.  Dealing Basic Attack damage to Heroes causes them to take an additional 2.5% of their maximum Health as damage.",
+        "icon": "storm_ui_icon_talent_autoattack_searing.png",
+        "type": "Passive",
         "sort": 3,
-        "abilityId": "Gazlowe|E1",
+        "abilityId": "Gazlowe|Passive",
         "abilityLinks": [
-          "Gazlowe|E1"
+          "Gazlowe|D1"
         ]
       }
     ],
@@ -361,51 +335,53 @@
         "tooltipId": "TinkerRoboGoblinMechaLordTalent",
         "talentTreeId": "TinkerMasteryMechaLord",
         "name": "Mecha-Lord",
-        "description": "Basic Attacks deal an additional 100% damage.  Passive: Gain 25 Armor.",
+        "description": "Basic Attacks increase Gazlowe's Armor by 10 for 10 seconds, up to a maximum of 30, and deal 50% bonus damage to Stunned or Slowed enemies.",
         "icon": "storm_ui_icon_gazlowe_robogoblin.png",
         "type": "Heroic",
         "sort": 1,
-        "abilityId": "Gazlowe|R2",
+        "abilityId": "Gazlowe|R1",
         "abilityLinks": [
-          "Gazlowe|R2"
+          "Gazlowe|R1"
         ]
       },
       {
         "tooltipId": "TinkerGravOBombMiniatureBlackHoleTalent",
         "talentTreeId": "TinkerMasteryMiniatureBlackHole",
         "name": "Miniature Black Hole",
-        "description": "Increases Grav-O-Bomb radius by 25% and damage by 50%.",
+        "description": "Increase Grav-O-Bomb 3000's radius by 25% and its damage by 50%. Each enemy Hero pulled reduces its cooldown by 12 seconds.",
         "icon": "storm_ui_icon_gazlowe_gravobomb.png",
         "type": "Heroic",
         "sort": 2,
-        "abilityId": "Gazlowe|R1",
+        "abilityId": "Gazlowe|R2",
         "abilityLinks": [
-          "Gazlowe|R1"
+          "Gazlowe|R2"
         ]
       },
       {
-        "tooltipId": "TinkerFirinMahLazorz",
-        "talentTreeId": "TinkerTalentFirinMahLazorz",
-        "name": "Firin' Mah Lazorz",
-        "description": "Firing Deth Lazor causes all of Gazlowe's Rock-It! Turrets to fire a Deth Lazor of their own that deals 137 (+4% per level) damage.",
-        "icon": "storm_ui_icon_gazlowe_dethlazor.png",
-        "type": "W",
+        "tooltipId": "TinkerItsRainingScrap",
+        "talentTreeId": "TinkerItsRainingScrap",
+        "name": "It's Raining Scrap",
+        "description": "Reduce the Scrap cost of Rock-It! Turrets by 1. Regain 2 Scrap for each Scrap pickup.",
+        "icon": "storm_ui_icon_gazlowe_rockitturret.png",
+        "type": "Q",
         "sort": 3,
-        "abilityId": "Gazlowe|W1",
+        "abilityId": "Gazlowe|Q1",
         "abilityLinks": [
-          "Gazlowe|W1"
+          "Gazlowe|Q1"
         ]
       },
       {
-        "tooltipId": "TinkerItsRainingScrap",
-        "talentTreeId": "TinkerItsRainingScrap",
-        "name": "It's Raining Scrap",
-        "description": "Activate to create 5 Scrap around Gazlowe over 5 seconds.",
-        "icon": "storm_ui_icon_gazlowe_itsrainingscrap.png",
-        "type": "Active",
+        "tooltipId": "GazloweXplodiumChargeBombToss",
+        "talentTreeId": "GazloweXplodiumChargeBombToss",
+        "name": "Bomb Toss",
+        "description": "Xplodium Charge launches 2 more bombs when it detonates.",
+        "icon": "storm_ui_icon_gazlowe_explodiumcharge.png",
+        "type": "E",
         "sort": 4,
-        "cooldown": 30,
-        "abilityId": "Gazlowe|Active"
+        "abilityId": "Gazlowe|E1",
+        "abilityLinks": [
+          "Gazlowe|E1"
+        ]
       }
     ]
   }
diff --git a/hero/imperius.json b/hero/imperius.json
index b6da218d..93220690 100644
--- a/hero/imperius.json
+++ b/hero/imperius.json
@@ -175,7 +175,7 @@
         "tooltipId": "ImperiusCelestialChargeFlashOfAnger",
         "talentTreeId": "ImperiusCelestialChargeFlashOfAnger",
         "name": "Flash of Anger",
-        "description": "Consuming a mark from Celestial Charge deals 180 (+4% per level) damage to the target and nearby enemies and grants Imperius a 300 (+4% per level) point Shield for 4 seconds.",
+        "description": "Consuming a mark from Celestial Charge deals 165 (+4% per level) damage to the target and nearby enemies and grants Imperius a 275 (+4% per level) point Shield for 4 seconds.",
         "icon": "storm_ui_icon_imperius_q.png",
         "type": "Q",
         "sort": 1,
diff --git a/hero/maiev.json b/hero/maiev.json
index f184af9d..33fab17c 100644
--- a/hero/maiev.json
+++ b/hero/maiev.json
@@ -285,7 +285,7 @@
         "tooltipId": "MaievSpiritOfVengeanceVengefulKnives",
         "talentTreeId": "MaievSpiritOfVengeanceVengefulKnives",
         "name": "Vengeful Knives",
-        "description": "Dealing damage to enemy Heores causes the next cast of Fan of Knives that hits enemy Heroes to deal 1% maximum Health as bonus damage, up to 5%.",
+        "description": "Dealing damage to enemy Heroes causes the next cast of Fan of Knives that hits enemy Heroes to deal 1% maximum Health as bonus damage, up to 5%.",
         "icon": "storm_ui_icon_maiev_knives.png",
         "type": "Q",
         "sort": 1,
diff --git a/hero/orphea.json b/hero/orphea.json
index 9508eb4d..eff35072 100644
--- a/hero/orphea.json
+++ b/hero/orphea.json
@@ -122,7 +122,7 @@
         "tooltipId": "OrpheaAncestralStrength",
         "talentTreeId": "OrpheaAncestralStrength",
         "name": "Ancestral Strength",
-        "description": "Non-Heroic Abilities deal 20% more damage to Stunned, Rooted, Silenced or Slowed enemies. Enemy Heroes who are hit with Overflowing Chaos are Slowed by 20% for 2.5 seconds.",
+        "description": "Non-Heroic Abilities deal 15% more damage to Stunned, Rooted, Silenced or Slowed enemies. Enemy Heroes who are hit with Overflowing Chaos are Slowed by 20% for 2.5 seconds.",
         "icon": "storm_ui_icon_orphea_trait.png",
         "type": "Trait",
         "sort": 3,
@@ -205,7 +205,7 @@
         "tooltipId": "OrpheaMindDevourer",
         "talentTreeId": "OrpheaMindDevourer",
         "name": "Mind Devourer",
-        "description": "Quest: Hitting Heroes with Dread increases its damage by 4, up to 160.  Reward: After hitting 40 Heroes, hitting an enemy Hero with Dread's eruption sets its cooldown to 6 seconds and refunds 50 Mana.",
+        "description": "Quest: Hitting Heroes with Dread increases its damage by 5, up to 150.  Reward: After hitting 30 Heroes, hitting an enemy Hero with Dread's eruption sets its cooldown to 6 seconds and refunds 50 Mana.",
         "icon": "storm_ui_icon_orphea_e.png",
         "type": "E",
         "sort": 3,
@@ -264,7 +264,7 @@
         "tooltipId": "OrpheaAbyssalSymbiosis",
         "talentTreeId": "OrpheaAbyssalSymbiosis",
         "name": "Abyssal Symbiosis",
-        "description": "Hitting a Hero with Chomp instantly grants Orphea maximum Chaos and a 180 (+4% per level) Shield for 3 seconds.",
+        "description": "Hitting a Hero with Chomp instantly grants Orphea maximum Chaos and a 170 (+4% per level) Shield for 3 seconds.",
         "icon": "storm_ui_icon_orphea_w.png",
         "type": "W",
         "sort": 2,
@@ -306,7 +306,7 @@
         "tooltipId": "OrpheaDeadMagic",
         "talentTreeId": "OrpheaDeadMagic",
         "name": "Dead Magic",
-        "description": "Basic Attacks that consume Chaos ignore Armor and deal 95 (+4% per level) Spell Damage to the target and all enemies around them.",
+        "description": "Basic Attacks that consume Chaos ignore Armor and deal 90 (+4% per level) Spell Damage to the target and all enemies around them.",
         "icon": "storm_ui_icon_orphea_trait.png",
         "type": "Trait",
         "sort": 2,
diff --git a/hero/qhira.json b/hero/qhira.json
index 6639a5f9..39431c72 100644
--- a/hero/qhira.json
+++ b/hero/qhira.json
@@ -124,7 +124,7 @@
         "tooltipId": "NexusHunterFinishingTouch",
         "talentTreeId": "NexusHunterFinishingTouch",
         "name": "Finishing Touch",
-        "description": "Gain 20%  Basic Attack damage. When Qhira Basic Attacks an enemy Hero below 50% Health it deals 20% additional damage, and she gains 35% Attack Speed for 3 seconds.",
+        "description": "Gain 20% Basic Attack damage. When Qhira Basic Attacks an enemy Hero below 50% Health it deals 20% additional damage, and she gains 35% Attack Speed for 3 seconds.",
         "icon": "storm_ui_icon_nexushunter_passive.png",
         "type": "Passive",
         "sort": 3,
diff --git a/hero/rexxar.json b/hero/rexxar.json
index ea55a72b..5bb4e02f 100644
--- a/hero/rexxar.json
+++ b/hero/rexxar.json
@@ -140,7 +140,7 @@
         "tooltipId": "RexxarHunterGathererTalent",
         "talentTreeId": "RexxarHunterGatherer",
         "name": "Hunter-Gatherer",
-        "description": "Quest: Gathering a Regeneration Globe increases Rexxar's Health Regeneration by 1 per second, up to 25 per second.  Reward: After gathering 25 Globes, Rexxar and Misha gain 15 Armor.",
+        "description": "Quest: Gathering a Regeneration Globe increases Rexxar and Misha's Health Regeneration by 1 per second, up to 25 per second.  Reward: After gathering 25 Globes, Rexxar and Misha gain 15 Armor.",
         "icon": "storm_ui_icon_talent_regenerationmaster.png",
         "type": "Passive",
         "sort": 2,
diff --git a/hero/stitches.json b/hero/stitches.json
index d5ffac6a..12ba8189 100644
--- a/hero/stitches.json
+++ b/hero/stitches.json
@@ -35,7 +35,7 @@
       {
         "uid": "4e38ee",
         "name": "Slam",
-        "description": "Deal 104 (+4% per level) damage to enemies within the target area. Enemies in the inner impact area take 40% more damage and are Slowed by 45% for 1.5 seconds.  Deals 50% bonus damage to Minions and Mercenaries.",
+        "description": "Deal 104 (+4% per level) damage to enemies within the target area. Enemies in the inner impact area take 40% more damage and are Slowed by 45% for 1.5 seconds.  Deals 60% bonus damage to Minions and Mercenaries.",
         "hotkey": "W",
         "abilityId": "Stitches|W1",
         "cooldown": 7,
diff --git a/hero/tassadar.json b/hero/tassadar.json
index d5db439f..c0a1d923 100644
--- a/hero/tassadar.json
+++ b/hero/tassadar.json
@@ -58,7 +58,7 @@
       {
         "uid": "642f46",
         "name": "Archon",
-        "description": "Tassadar transforms into an Archon, gaining a Shield equal to 30% of his maximum Health and empowering Resonance Beam. Lasts for 12 seconds.  Resonance Beam: Deals 150 (+4% per level) damage to the target and splashes 75 (+4% per level) damage to nearby enemies. Heroes hit have their Spell Armor reduced by 20 for 2 seconds. Resonance Beam is fully charged while Archon is active.",
+        "description": "Tassadar transforms into an Archon, gaining a Shield equal to 25% of his maximum Health and empowering Resonance Beam. Lasts for 12 seconds.  Resonance Beam: Deals 140 (+4% per level) damage to the target and splashes 70 (+4% per level) damage to nearby enemies. Heroes hit have their Spell Armor reduced by 20 for 2 seconds. Resonance Beam is fully charged while Archon is active.",
         "hotkey": "R",
         "abilityId": "Tassadar|R1",
         "cooldown": 90,
@@ -94,7 +94,7 @@
         "tooltipId": "TassadarStaticCharge",
         "talentTreeId": "TassadarStaticCharge",
         "name": "Static Charge",
-        "description": "Quest: Heroes hit by Shock Ray permanently increases its damage by 5 and grants 33% Resonance Beam charge.  Maximum of 250 bonus damage.",
+        "description": "Quest: Heroes hit by Shock Ray permanently increases its damage by 5 and grants 33% Resonance Beam charge.  Maximum of 200 bonus damage.",
         "icon": "storm_ui_icon_tassadar_rework_q_ray.png",
         "type": "Q",
         "sort": 1,
@@ -220,7 +220,7 @@
         "tooltipId": "TassadarArchon",
         "talentTreeId": "TassadarHeroicAbilityArchon",
         "name": "Archon",
-        "description": "Tassadar transforms into an Archon, gaining a Shield equal to 30% of his maximum Health and empowering Resonance Beam. Lasts for 12 seconds.  Resonance Beam: Deals 150 (+4% per level) damage to the target and splashes 75 (+4% per level) damage to nearby enemies. Heroes hit have their Spell Armor reduced by 20 for 2 seconds. Resonance Beam is fully charged while Archon is active.",
+        "description": "Tassadar transforms into an Archon, gaining a Shield equal to 25% of his maximum Health and empowering Resonance Beam. Lasts for 12 seconds.  Resonance Beam: Deals 140 (+4% per level) damage to the target and splashes 70 (+4% per level) damage to nearby enemies. Heroes hit have their Spell Armor reduced by 20 for 2 seconds. Resonance Beam is fully charged while Archon is active.",
         "icon": "storm_ui_icon_tassadar_archon.png",
         "type": "Heroic",
         "sort": 1,
diff --git a/hero/yrel.json b/hero/yrel.json
index 6e3d279c..d37bb447 100644
--- a/hero/yrel.json
+++ b/hero/yrel.json
@@ -110,7 +110,7 @@
         "tooltipId": "YrelDauntless",
         "talentTreeId": "YrelDauntless",
         "name": "Dauntless",
-        "description": "Casting a Basic Ability grants Yrel 40 Physical Armor for 2.5 seconds.",
+        "description": "Casting a Basic Ability grants Yrel 35 Physical Armor for 2.5 seconds.",
         "icon": "storm_ui_icon_talent_abilitytalent_armor.png",
         "type": "Passive",
         "sort": 2,
diff --git a/images/talents/storm_ui_icon_dva_mechmode_b.png b/images/talents/storm_ui_icon_dva_mechmode_b.png
new file mode 100644
index 00000000..8abcd1cb
Binary files /dev/null and b/images/talents/storm_ui_icon_dva_mechmode_b.png differ
diff --git a/images/talents/storm_ui_icon_dva_micromissiles.png b/images/talents/storm_ui_icon_dva_micromissiles.png
new file mode 100644
index 00000000..1c65d539
Binary files /dev/null and b/images/talents/storm_ui_icon_dva_micromissiles.png differ
diff --git a/images/talents/storm_ui_icon_gazlowe_combo_w_e.png b/images/talents/storm_ui_icon_gazlowe_combo_w_e.png
new file mode 100644
index 00000000..19096da6
Binary files /dev/null and b/images/talents/storm_ui_icon_gazlowe_combo_w_e.png differ
diff --git a/images/talents/storm_ui_icon_gazlowe_rockitturret_var2.png b/images/talents/storm_ui_icon_gazlowe_rockitturret_var2.png
new file mode 100644
index 00000000..882f5d61
Binary files /dev/null and b/images/talents/storm_ui_icon_gazlowe_rockitturret_var2.png differ