diff --git a/eos/effects/armortankinggang2.py b/eos/effects/armorwarfarearmorhpreplacer.py
similarity index 92%
rename from eos/effects/armortankinggang2.py
rename to eos/effects/armorwarfarearmorhpreplacer.py
index baa284623..ffcf0efec 100644
--- a/eos/effects/armortankinggang2.py
+++ b/eos/effects/armorwarfarearmorhpreplacer.py
@@ -1,4 +1,4 @@
-# armorTankingGang2
+# armorWarfareArmorHpReplacer
 #
 # Used by:
 # Implant: Armored Warfare Mindlink
diff --git a/eos/effects/boosterarmorhppenalty.py b/eos/effects/boosterarmorhppenalty.py
index e7ccfb79c..0d3a3ea05 100644
--- a/eos/effects/boosterarmorhppenalty.py
+++ b/eos/effects/boosterarmorhppenalty.py
@@ -1,7 +1,7 @@
 # boosterArmorHpPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 39)
+# Implants from group: Booster (12 of 37)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.ship.boostItemAttr("armorHP", booster.getModifiedItemAttr("boosterArmorHPPenalty"))
diff --git a/eos/effects/boosterarmorrepairamountpenalty.py b/eos/effects/boosterarmorrepairamountpenalty.py
index 6ecd643f6..4e3bb0738 100644
--- a/eos/effects/boosterarmorrepairamountpenalty.py
+++ b/eos/effects/boosterarmorrepairamountpenalty.py
@@ -1,7 +1,7 @@
 # boosterArmorRepairAmountPenalty
 #
 # Used by:
-# Implants from group: Booster (9 of 39)
+# Implants from group: Booster (9 of 37)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Unit",
diff --git a/eos/effects/boostermaxvelocitypenalty.py b/eos/effects/boostermaxvelocitypenalty.py
index 7c9339796..6a2be21a3 100644
--- a/eos/effects/boostermaxvelocitypenalty.py
+++ b/eos/effects/boostermaxvelocitypenalty.py
@@ -1,7 +1,7 @@
 # boosterMaxVelocityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 39)
+# Implants from group: Booster (12 of 37)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.ship.boostItemAttr("maxVelocity", booster.getModifiedItemAttr("boosterMaxVelocityPenalty"))
diff --git a/eos/effects/boostershieldcapacitypenalty.py b/eos/effects/boostershieldcapacitypenalty.py
index a6b8f0b28..642036e3d 100644
--- a/eos/effects/boostershieldcapacitypenalty.py
+++ b/eos/effects/boostershieldcapacitypenalty.py
@@ -1,7 +1,7 @@
 # boosterShieldCapacityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 39)
+# Implants from group: Booster (12 of 37)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.ship.boostItemAttr("shieldCapacity", booster.getModifiedItemAttr("boosterShieldCapacityPenalty"))
diff --git a/eos/effects/boosterturretoptimalrangepenalty.py b/eos/effects/boosterturretoptimalrangepenalty.py
index 2d556a4dd..9881cf501 100644
--- a/eos/effects/boosterturretoptimalrangepenalty.py
+++ b/eos/effects/boosterturretoptimalrangepenalty.py
@@ -1,7 +1,7 @@
 # boosterTurretOptimalRangePenalty
 #
 # Used by:
-# Implants from group: Booster (9 of 39)
+# Implants from group: Booster (9 of 37)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
diff --git a/eos/effects/informationwarfaremaxtargetrangebonus.py b/eos/effects/informationwarfaremaxtargetrangebonus.py
new file mode 100644
index 000000000..5e4bfed19
--- /dev/null
+++ b/eos/effects/informationwarfaremaxtargetrangebonus.py
@@ -0,0 +1,11 @@
+# informationWarfareMaxTargetRangeBonus
+#
+# Used by:
+# Implant: Caldari Navy Warfare Mindlink
+# Implant: Imperial Navy Warfare Mindlink
+# Implant: Information Warfare Mindlink
+type = "gang"
+gangBoost = "maxTargetRange"
+gangBonus = "maxTargetRangeBonus"
+def handler(fit, container, context):
+    fit.ship.boostItemAttr(gangBoost, container.getModifiedItemAttr(gangBonus))
diff --git a/eos/effects/informationwarfaremindlinkhidden.py b/eos/effects/informationwarfaremindlinkhidden.py
index f59c806ba..6d3d6c6a7 100644
--- a/eos/effects/informationwarfaremindlinkhidden.py
+++ b/eos/effects/informationwarfaremindlinkhidden.py
@@ -2,7 +2,6 @@
 #
 # Used by:
 # Implant: Caldari Navy Warfare Mindlink
-# Implant: Imperial Navy Warfare Mindlink
 # Implant: Information Warfare Mindlink
 type = "passive"
 def handler(fit, implant, context):
diff --git a/eos/effects/miningforemanmindlinkminingamountbonusreplacer.py b/eos/effects/miningforemanmindlinkminingamountbonusreplacer.py
new file mode 100644
index 000000000..bdf856667
--- /dev/null
+++ b/eos/effects/miningforemanmindlinkminingamountbonusreplacer.py
@@ -0,0 +1,10 @@
+# miningForemanMindLinkMiningAmountBonusReplacer
+#
+# Used by:
+# Implant: Mining Foreman Mindlink
+type = "gang"
+gangBoost = "miningAmount"
+gangBonus = "miningAmountBonus"
+def handler(fit, container, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
+                                  gangBoost, container.getModifiedItemAttr(gangBonus) * level)
diff --git a/eos/effects/miningyieldgangbonusfixed.py b/eos/effects/miningyieldgangbonusfixed.py
index 9367e55e3..1b6a0a583 100644
--- a/eos/effects/miningyieldgangbonusfixed.py
+++ b/eos/effects/miningyieldgangbonusfixed.py
@@ -1,7 +1,6 @@
 # miningYieldGangBonusFixed
 #
 # Used by:
-# Implant: Mining Foreman Mindlink
 # Skill: Mining Foreman
 type = "gang"
 gangBoost = "miningAmount"
diff --git a/eos/effects/missileskillrapidlauncherrof.py b/eos/effects/missileskillrapidlauncherrof.py
index 731f97c5d..dc200dde2 100644
--- a/eos/effects/missileskillrapidlauncherrof.py
+++ b/eos/effects/missileskillrapidlauncherrof.py
@@ -1,7 +1,7 @@
 # missileSkillRapidLauncherRoF
 #
 # Used by:
-# Implants named like: Cerebral Accelerator (5 of 5)
+# Implants named like: Cerebral Accelerator (3 of 3)
 # Implants named like: Zainou 'Deadeye' Rapid Launch RL (6 of 6)
 # Implant: Whelan Machorin's Ballistic Smartlink
 # Skill: Missile Launcher Operation
diff --git a/eos/effects/overloadselfthermalhardeningbonus.py b/eos/effects/overloadselfthermalhardeningbonus.py
index a3e8c91e0..5a4036980 100644
--- a/eos/effects/overloadselfthermalhardeningbonus.py
+++ b/eos/effects/overloadselfthermalhardeningbonus.py
@@ -1,9 +1,9 @@
 # overloadSelfThermalHardeningBonus
 #
 # Used by:
-# Variations of module: Armor Thermic Hardener I (39 of 39)
-# Variations of module: Thermic Dissipation Field I (19 of 19)
-# Module: Civilian Thermic Dissipation Field
+# Variations of module: Armor Thermal Hardener I (39 of 39)
+# Variations of module: Thermal Dissipation Field I (19 of 19)
+# Module: Civilian Thermal Dissipation Field
 type = "overheat"
 def handler(fit, module, context):
     module.boostItemAttr("thermalDamageResistanceBonus", module.getModifiedItemAttr("overloadHardeningBonus"))
\ No newline at end of file
diff --git a/eos/effects/reconoperationsmaxtargetrangebonuspostpercentmaxtargetrangegangships.py b/eos/effects/reconoperationsmaxtargetrangebonuspostpercentmaxtargetrangegangships.py
index 00a2707a4..db12c57db 100644
--- a/eos/effects/reconoperationsmaxtargetrangebonuspostpercentmaxtargetrangegangships.py
+++ b/eos/effects/reconoperationsmaxtargetrangebonuspostpercentmaxtargetrangegangships.py
@@ -1,9 +1,6 @@
 # reconOperationsMaxTargetRangeBonusPostPercentMaxTargetRangeGangShips
 #
 # Used by:
-# Implant: Caldari Navy Warfare Mindlink
-# Implant: Imperial Navy Warfare Mindlink
-# Implant: Information Warfare Mindlink
 # Skill: Information Warfare
 type = "gang"
 gangBoost = "maxTargetRange"
diff --git a/eos/effects/shielddefensiveoperationsshieldcapacitybonuspostpercentshieldcapacitygangships.py b/eos/effects/shielddefensiveoperationsshieldcapacitybonuspostpercentshieldcapacitygangships.py
index 1c16a3066..5d38c76e3 100644
--- a/eos/effects/shielddefensiveoperationsshieldcapacitybonuspostpercentshieldcapacitygangships.py
+++ b/eos/effects/shielddefensiveoperationsshieldcapacitybonuspostpercentshieldcapacitygangships.py
@@ -1,9 +1,6 @@
 # shieldDefensiveOperationsShieldCapacityBonusPostPercentShieldCapacityGangShips
 #
 # Used by:
-# Implant: Caldari Navy Warfare Mindlink
-# Implant: Republic Fleet Warfare Mindlink
-# Implant: Siege Warfare Mindlink
 # Skill: Siege Warfare
 type = "gang"
 gangBoost = "shieldCapacity"
diff --git a/eos/effects/shiparmoremresistancerookie.py b/eos/effects/shiparmoremresistancerookie.py
index c35e701d3..9baaf9c4c 100644
--- a/eos/effects/shiparmoremresistancerookie.py
+++ b/eos/effects/shiparmoremresistancerookie.py
@@ -2,8 +2,10 @@
 #
 # Used by:
 # Ship: Devoter
+# Ship: Gold Magnate
 # Ship: Impairor
 # Ship: Phobos
+# Ship: Silver Magnate
 type = "passive"
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("rookieArmorResistanceBonus"))
diff --git a/eos/effects/shiparmorexresistancerookie.py b/eos/effects/shiparmorexresistancerookie.py
index a0f2becf6..35868ef02 100644
--- a/eos/effects/shiparmorexresistancerookie.py
+++ b/eos/effects/shiparmorexresistancerookie.py
@@ -2,8 +2,10 @@
 #
 # Used by:
 # Ship: Devoter
+# Ship: Gold Magnate
 # Ship: Impairor
 # Ship: Phobos
+# Ship: Silver Magnate
 type = "passive"
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("rookieArmorResistanceBonus"))
diff --git a/eos/effects/shiparmorknresistancerookie.py b/eos/effects/shiparmorknresistancerookie.py
index d3f68efa4..efc324adf 100644
--- a/eos/effects/shiparmorknresistancerookie.py
+++ b/eos/effects/shiparmorknresistancerookie.py
@@ -2,8 +2,10 @@
 #
 # Used by:
 # Ship: Devoter
+# Ship: Gold Magnate
 # Ship: Impairor
 # Ship: Phobos
+# Ship: Silver Magnate
 type = "passive"
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("rookieArmorResistanceBonus"))
diff --git a/eos/effects/shiparmorthresistancerookie.py b/eos/effects/shiparmorthresistancerookie.py
index c5fe4045f..385e27b4b 100644
--- a/eos/effects/shiparmorthresistancerookie.py
+++ b/eos/effects/shiparmorthresistancerookie.py
@@ -2,8 +2,10 @@
 #
 # Used by:
 # Ship: Devoter
+# Ship: Gold Magnate
 # Ship: Impairor
 # Ship: Phobos
+# Ship: Silver Magnate
 type = "passive"
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("rookieArmorResistanceBonus"))
diff --git a/eos/effects/siegewarfareshieldcapacitybonusreplacer.py b/eos/effects/siegewarfareshieldcapacitybonusreplacer.py
new file mode 100644
index 000000000..3fd0a62fa
--- /dev/null
+++ b/eos/effects/siegewarfareshieldcapacitybonusreplacer.py
@@ -0,0 +1,11 @@
+# siegeWarfareShieldCapacityBonusReplacer
+#
+# Used by:
+# Implant: Caldari Navy Warfare Mindlink
+# Implant: Republic Fleet Warfare Mindlink
+# Implant: Siege Warfare Mindlink
+type = "gang"
+gangBoost = "shieldCapacity"
+gangBonus = "shieldCapacityBonus"
+def handler(fit, container, context):
+    fit.ship.boostItemAttr(gangBoost, container.getModifiedItemAttr(gangBonus) * level)
diff --git a/eos/effects/skirmishwarfareagilitybonus.py b/eos/effects/skirmishwarfareagilitybonus.py
index 7ce7e0ad8..39ec2c90a 100644
--- a/eos/effects/skirmishwarfareagilitybonus.py
+++ b/eos/effects/skirmishwarfareagilitybonus.py
@@ -1,9 +1,6 @@
 # skirmishWarfareAgilityBonus
 #
 # Used by:
-# Implant: Federation Navy Warfare Mindlink
-# Implant: Republic Fleet Warfare Mindlink
-# Implant: Skirmish Warfare Mindlink
 # Skill: Skirmish Warfare
 type = "gang"
 gangBoost = "agility"
diff --git a/eos/effects/skirmishwarfareagilitybonusreplacer.py b/eos/effects/skirmishwarfareagilitybonusreplacer.py
new file mode 100644
index 000000000..e89c3a217
--- /dev/null
+++ b/eos/effects/skirmishwarfareagilitybonusreplacer.py
@@ -0,0 +1,11 @@
+# skirmishWarfareAgilityBonusReplacer
+#
+# Used by:
+# Implant: Federation Navy Warfare Mindlink
+# Implant: Republic Fleet Warfare Mindlink
+# Implant: Skirmish Warfare Mindlink
+type = "gang"
+gangBoost = "agility"
+gangBonus = "agilityBonus"
+def handler(fit, container, context):
+    fit.ship.boostItemAttr(gangBoost, container.getModifiedItemAttr(gangBonus) * level)
diff --git a/eos/effects/smallenergymaxrangebonus.py b/eos/effects/smallenergymaxrangebonus.py
index f67219ccd..4e3ea5f31 100644
--- a/eos/effects/smallenergymaxrangebonus.py
+++ b/eos/effects/smallenergymaxrangebonus.py
@@ -2,6 +2,8 @@
 #
 # Used by:
 # Ship: Coercer
+# Ship: Gold Magnate
+# Ship: Silver Magnate
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
diff --git a/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py b/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py
index 1a970cad1..eb111421b 100644
--- a/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py
+++ b/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py
@@ -1,7 +1,7 @@
 # surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringGunnery
 #
 # Used by:
-# Implants named like: Cerebral Accelerator (5 of 5)
+# Implants named like: Cerebral Accelerator (3 of 3)
 # Implants named like: Eifyr and Co. 'Gunslinger' Surgical Strike SS (6 of 6)
 type = "passive"
 def handler(fit, implant, context):
diff --git a/eos/effects/thermalshieldcompensationhardeningbonusgroupshieldamp.py b/eos/effects/thermalshieldcompensationhardeningbonusgroupshieldamp.py
index 0f318c05e..1dec7e8d3 100644
--- a/eos/effects/thermalshieldcompensationhardeningbonusgroupshieldamp.py
+++ b/eos/effects/thermalshieldcompensationhardeningbonusgroupshieldamp.py
@@ -1,7 +1,7 @@
 # thermalShieldCompensationHardeningBonusGroupShieldAmp
 #
 # Used by:
-# Skill: Thermic Shield Compensation
+# Skill: Thermal Shield Compensation
 type = "passive"
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Amplifier",
diff --git a/eos/effects/thermicarmorcompensationhardeningbonusgrouparmorcoating.py b/eos/effects/thermicarmorcompensationhardeningbonusgrouparmorcoating.py
index 2ea9d5af5..653b75056 100644
--- a/eos/effects/thermicarmorcompensationhardeningbonusgrouparmorcoating.py
+++ b/eos/effects/thermicarmorcompensationhardeningbonusgrouparmorcoating.py
@@ -1,7 +1,7 @@
 # thermicArmorCompensationHardeningBonusGroupArmorCoating
 #
 # Used by:
-# Skill: Thermic Armor Compensation
+# Skill: Thermal Armor Compensation
 type = "passive"
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Coating",
diff --git a/eos/effects/thermicarmorcompensationhardeningbonusgroupenergized.py b/eos/effects/thermicarmorcompensationhardeningbonusgroupenergized.py
index c4829419a..ef2765202 100644
--- a/eos/effects/thermicarmorcompensationhardeningbonusgroupenergized.py
+++ b/eos/effects/thermicarmorcompensationhardeningbonusgroupenergized.py
@@ -1,7 +1,7 @@
 # thermicArmorCompensationHardeningBonusGroupEnergized
 #
 # Used by:
-# Skill: Thermic Armor Compensation
+# Skill: Thermal Armor Compensation
 type = "passive"
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Plating Energized",
diff --git a/eve.db b/eve.db
index 3a06c8734..5eadbbf1f 100644
Binary files a/eve.db and b/eve.db differ