diff --git a/eos/effects/interceptor2projectiletracking.py b/eos/effects/interceptor2projectiledamage.py
old mode 100755
new mode 100644
similarity index 66%
rename from eos/effects/interceptor2projectiletracking.py
rename to eos/effects/interceptor2projectiledamage.py
index afa4cb7e7..933396691
--- a/eos/effects/interceptor2projectiletracking.py
+++ b/eos/effects/interceptor2projectiledamage.py
@@ -4,4 +4,4 @@ type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Interceptors").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                    "trackingSpeed", ship.getModifiedItemAttr("eliteBonusInterceptor2") * level)
\ No newline at end of file
+                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusInterceptor2") * level)
diff --git a/eos/effects/interceptor2shieldresist.py b/eos/effects/interceptor2shieldresist.py
new file mode 100644
index 000000000..f6ea82410
--- /dev/null
+++ b/eos/effects/interceptor2shieldresist.py
@@ -0,0 +1,8 @@
+# Used by:
+# Ship: Raptor
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Interceptors").level
+    damageTypes = ("Em", "Explosive", "Kinetic", "Thermal")
+    for damageType in damageTypes:
+        fit.ship.boostItemAttr("shield{0}DamageResonance".format(damageType), ship.getModifiedItemAttr("eliteBonusInterceptor2") * level)
diff --git a/eos/effects/minigamevirusstrengthbonus.py b/eos/effects/minigamevirusstrengthbonus.py
index 0e5f14e69..f5459bb74 100644
--- a/eos/effects/minigamevirusstrengthbonus.py
+++ b/eos/effects/minigamevirusstrengthbonus.py
@@ -1,10 +1,8 @@
 # Used by:
 # Ships from group: Covert Ops (5 of 5)
+# Ships from group: Frigate (10 of 43)
 # Subsystems named like: Electronics Emergent Locus Analyzer (4 of 4)
-# Variations of ship: Heron (3 of 3)
-# Variations of ship: Imicus (3 of 3)
-# Variations of ship: Magnate (4 of 6)
-# Variations of ship: Probe (3 of 3)
+# Ship: Stratios
 type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
diff --git a/eos/effects/overloadrofbonus.py b/eos/effects/overloadrofbonus.py
index 9aafdcb04..6bcc42237 100755
--- a/eos/effects/overloadrofbonus.py
+++ b/eos/effects/overloadrofbonus.py
@@ -2,10 +2,12 @@
 # Modules from group: Energy Weapon (100 of 183)
 # Modules from group: Hybrid Weapon (110 of 199)
 # Modules from group: Missile Launcher Citadel (4 of 4)
+# Modules from group: Missile Launcher Cruise (20 of 20)
 # Modules from group: Missile Launcher Heavy (12 of 12)
 # Modules from group: Missile Launcher Rocket (14 of 14)
+# Modules from group: Missile Launcher Torpedo (21 of 21)
 # Modules from group: Projectile Weapon (60 of 143)
-# Modules named like: Launcher (103 of 117)
+# Modules named like: Missile Launcher (81 of 82)
 type = "overheat"
 def handler(fit, module, context):
     module.boostItemAttr("speed", module.getModifiedItemAttr("overloadRofBonus"))
diff --git a/eos/effects/rolebonusmaraudermjdrreactivationdelaybonus.py b/eos/effects/rolebonusmaraudermjdrreactivationdelaybonus.py
new file mode 100644
index 000000000..871ee46e7
--- /dev/null
+++ b/eos/effects/rolebonusmaraudermjdrreactivationdelaybonus.py
@@ -0,0 +1,6 @@
+# Used by:
+# Ships from group: Marauder (4 of 4)
+type = "passive"
+def handler(fit, ship, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Micro Jump Drive",
+                                  "moduleReactivationDelay", ship.getModifiedItemAttr("roleBonusMarauder"))
diff --git a/eos/effects/shiparmoremandexpandkinandthmresistanceac2.py b/eos/effects/shiparmoremandexpandkinandthmresistanceac2.py
index a486f5b26..8c28698d8 100755
--- a/eos/effects/shiparmoremandexpandkinandthmresistanceac2.py
+++ b/eos/effects/shiparmoremandexpandkinandthmresistanceac2.py
@@ -1,5 +1,6 @@
 # Used by:
 # Ship: Sacrilege
+# Ship: Stratios
 # Ship: Vangel
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shiparmoremresistance1abc1.py b/eos/effects/shiparmoremresistance1abc1.py
index bee9b3b48..df8708e58 100755
--- a/eos/effects/shiparmoremresistance1abc1.py
+++ b/eos/effects/shiparmoremresistance1abc1.py
@@ -1,5 +1,6 @@
 # Used by:
-# Variations of ship: Prophecy (3 of 3)
+# Variations of ship: Prophecy (2 of 2)
+# Ship: Absolution
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Battlecruiser").level
diff --git a/eos/effects/shiparmoremresistanceaf1.py b/eos/effects/shiparmoremresistanceaf1.py
index e84e98ef9..32e37d9c1 100755
--- a/eos/effects/shiparmoremresistanceaf1.py
+++ b/eos/effects/shiparmoremresistanceaf1.py
@@ -1,4 +1,5 @@
 # Used by:
+# Ship: Astero
 # Ship: Malice
 # Ship: Punisher
 type = "passive"
diff --git a/eos/effects/shiparmorexplosiveresistance1abc1.py b/eos/effects/shiparmorexplosiveresistance1abc1.py
index b81ccd01d..b8399d782 100755
--- a/eos/effects/shiparmorexplosiveresistance1abc1.py
+++ b/eos/effects/shiparmorexplosiveresistance1abc1.py
@@ -1,5 +1,6 @@
 # Used by:
-# Variations of ship: Prophecy (3 of 3)
+# Variations of ship: Prophecy (2 of 2)
+# Ship: Absolution
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Battlecruiser").level
diff --git a/eos/effects/shiparmorexresistanceaf1.py b/eos/effects/shiparmorexresistanceaf1.py
index 8580c185b..947227534 100755
--- a/eos/effects/shiparmorexresistanceaf1.py
+++ b/eos/effects/shiparmorexresistanceaf1.py
@@ -1,4 +1,5 @@
 # Used by:
+# Ship: Astero
 # Ship: Malice
 # Ship: Punisher
 type = "passive"
diff --git a/eos/effects/shiparmorkineticresistance1abc1.py b/eos/effects/shiparmorkineticresistance1abc1.py
index 7ca53c617..97bd821c7 100755
--- a/eos/effects/shiparmorkineticresistance1abc1.py
+++ b/eos/effects/shiparmorkineticresistance1abc1.py
@@ -1,5 +1,6 @@
 # Used by:
-# Variations of ship: Prophecy (3 of 3)
+# Variations of ship: Prophecy (2 of 2)
+# Ship: Absolution
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Battlecruiser").level
diff --git a/eos/effects/shiparmorknresistanceaf1.py b/eos/effects/shiparmorknresistanceaf1.py
index 754ae637d..76dd6a839 100755
--- a/eos/effects/shiparmorknresistanceaf1.py
+++ b/eos/effects/shiparmorknresistanceaf1.py
@@ -1,4 +1,5 @@
 # Used by:
+# Ship: Astero
 # Ship: Malice
 # Ship: Punisher
 type = "passive"
diff --git a/eos/effects/shiparmorrepairing1gbc2.py b/eos/effects/shiparmorrepairing1gbc2.py
index ddb0f28a0..1b380bf4e 100755
--- a/eos/effects/shiparmorrepairing1gbc2.py
+++ b/eos/effects/shiparmorrepairing1gbc2.py
@@ -1,6 +1,7 @@
 # Used by:
-# Variations of ship: Brutix (3 of 4)
-# Ship: Myrmidon
+# Variations of ship: Myrmidon (2 of 2)
+# Ship: Astarte
+# Ship: Brutix
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Gallente Battlecruiser").level
diff --git a/eos/effects/shipbonusarmoremandexpandkinandthermresistance2af.py b/eos/effects/shiparmorresistanceaf1.py
old mode 100755
new mode 100644
similarity index 82%
rename from eos/effects/shipbonusarmoremandexpandkinandthermresistance2af.py
rename to eos/effects/shiparmorresistanceaf1.py
index 19b1445a6..993fef0b0
--- a/eos/effects/shipbonusarmoremandexpandkinandthermresistance2af.py
+++ b/eos/effects/shiparmorresistanceaf1.py
@@ -5,4 +5,4 @@ def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Frigate").level
     damageTypes = ("Em", "Explosive", "Kinetic", "Thermal")
     for damageType in damageTypes:
-        fit.ship.boostItemAttr("armor{0}DamageResonance".format(damageType), ship.getModifiedItemAttr("shipBonus2AF") * level)
+        fit.ship.boostItemAttr("armor{0}DamageResonance".format(damageType), ship.getModifiedItemAttr("shipBonusAF") * level)
diff --git a/eos/effects/shiparmorthermresistance1abc1.py b/eos/effects/shiparmorthermresistance1abc1.py
index 5df026937..f4a9c7c03 100755
--- a/eos/effects/shiparmorthermresistance1abc1.py
+++ b/eos/effects/shiparmorthermresistance1abc1.py
@@ -1,5 +1,6 @@
 # Used by:
-# Variations of ship: Prophecy (3 of 3)
+# Variations of ship: Prophecy (2 of 2)
+# Ship: Absolution
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Battlecruiser").level
diff --git a/eos/effects/shiparmorthresistanceaf1.py b/eos/effects/shiparmorthresistanceaf1.py
index 578b95906..68df1d744 100755
--- a/eos/effects/shiparmorthresistanceaf1.py
+++ b/eos/effects/shiparmorthresistanceaf1.py
@@ -1,4 +1,5 @@
 # Used by:
+# Ship: Astero
 # Ship: Malice
 # Ship: Punisher
 type = "passive"
diff --git a/eos/effects/shipmissileemdamagemb.py b/eos/effects/shipbonuscruisemissileemdmgmb.py
similarity index 88%
rename from eos/effects/shipmissileemdamagemb.py
rename to eos/effects/shipbonuscruisemissileemdmgmb.py
index 8ae11c3d7..b687faf5c 100644
--- a/eos/effects/shipmissileemdamagemb.py
+++ b/eos/effects/shipbonuscruisemissileemdmgmb.py
@@ -3,5 +3,5 @@
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Battleship").level
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
                                     "emDamage", ship.getModifiedItemAttr("shipBonusMB") * level)
diff --git a/eos/effects/shipmissileexplosivedamagemb.py b/eos/effects/shipbonuscruisemissileexplodmgmb.py
similarity index 88%
rename from eos/effects/shipmissileexplosivedamagemb.py
rename to eos/effects/shipbonuscruisemissileexplodmgmb.py
index ba0e0304c..93b8e41c0 100644
--- a/eos/effects/shipmissileexplosivedamagemb.py
+++ b/eos/effects/shipbonuscruisemissileexplodmgmb.py
@@ -3,5 +3,5 @@
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Battleship").level
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
                                     "explosiveDamage", ship.getModifiedItemAttr("shipBonusMB") * level)
diff --git a/eos/effects/shipmissilekineticdamagemb.py b/eos/effects/shipbonuscruisemissilekineticdmgmb.py
similarity index 88%
rename from eos/effects/shipmissilekineticdamagemb.py
rename to eos/effects/shipbonuscruisemissilekineticdmgmb.py
index dba9702a8..38ca1310c 100644
--- a/eos/effects/shipmissilekineticdamagemb.py
+++ b/eos/effects/shipbonuscruisemissilekineticdmgmb.py
@@ -3,5 +3,5 @@
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Battleship").level
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
                                     "kineticDamage", ship.getModifiedItemAttr("shipBonusMB") * level)
diff --git a/eos/effects/shipmissilethermaldamagemb.py b/eos/effects/shipbonuscruisemissilethermdmgmb.py
similarity index 88%
rename from eos/effects/shipmissilethermaldamagemb.py
rename to eos/effects/shipbonuscruisemissilethermdmgmb.py
index e960aa2c1..a358c609e 100644
--- a/eos/effects/shipmissilethermaldamagemb.py
+++ b/eos/effects/shipbonuscruisemissilethermdmgmb.py
@@ -3,5 +3,5 @@
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Battleship").level
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
                                     "thermalDamage", ship.getModifiedItemAttr("shipBonusMB") * level)
diff --git a/eos/effects/shiplauncherrofbonusmb1.py b/eos/effects/shipbonuscruiserofmb.py
old mode 100755
new mode 100644
similarity index 78%
rename from eos/effects/shiplauncherrofbonusmb1.py
rename to eos/effects/shipbonuscruiserofmb.py
index 2e830fc37..1508f20e3
--- a/eos/effects/shiplauncherrofbonusmb1.py
+++ b/eos/effects/shipbonuscruiserofmb.py
@@ -3,6 +3,5 @@
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Battleship").level
-    groups = ("Missile Launcher Torpedo", "Missile Launcher Cruise")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Cruise",
                                   "speed", ship.getModifiedItemAttr("shipBonusMB") * level)
diff --git a/eos/effects/shipbonusdronedamagemultipliergb2.py b/eos/effects/shipbonusdronedamagemultipliergb2.py
index 2567cae59..3eaa8ed70 100755
--- a/eos/effects/shipbonusdronedamagemultipliergb2.py
+++ b/eos/effects/shipbonusdronedamagemultipliergb2.py
@@ -1,5 +1,6 @@
 # Used by:
 # Variations of ship: Dominix (3 of 3)
+# Ship: Nestor
 # Ship: Rattlesnake
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipbonusdronedamagemultipliergbc1.py b/eos/effects/shipbonusdronedamagemultipliergbc1.py
index 401c22ea6..6aa1275c7 100755
--- a/eos/effects/shipbonusdronedamagemultipliergbc1.py
+++ b/eos/effects/shipbonusdronedamagemultipliergbc1.py
@@ -1,6 +1,5 @@
 # Used by:
-# Ship: Eos
-# Ship: Myrmidon
+# Variations of ship: Myrmidon (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Gallente Battlecruiser").level
diff --git a/eos/effects/shipbonusdronedamagemultipliergc2.py b/eos/effects/shipbonusdronedamagemultipliergc2.py
index 892173d90..91c847a9e 100755
--- a/eos/effects/shipbonusdronedamagemultipliergc2.py
+++ b/eos/effects/shipbonusdronedamagemultipliergc2.py
@@ -1,6 +1,7 @@
 # Used by:
 # Variations of ship: Vexor (3 of 4)
 # Ship: Gila
+# Ship: Stratios
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Gallente Cruiser").level
diff --git a/eos/effects/shipbonusdronehitpointsgb2.py b/eos/effects/shipbonusdronehitpointsgb2.py
index 83b91493a..9f3f36e5f 100755
--- a/eos/effects/shipbonusdronehitpointsgb2.py
+++ b/eos/effects/shipbonusdronehitpointsgb2.py
@@ -1,5 +1,6 @@
 # Used by:
 # Variations of ship: Dominix (3 of 3)
+# Ship: Nestor
 # Ship: Rattlesnake
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipbonusdronehitpointsgbc1.py b/eos/effects/shipbonusdronehitpointsgbc1.py
index da9ade8c2..83c51d8a3 100755
--- a/eos/effects/shipbonusdronehitpointsgbc1.py
+++ b/eos/effects/shipbonusdronehitpointsgbc1.py
@@ -1,6 +1,5 @@
 # Used by:
-# Ship: Eos
-# Ship: Myrmidon
+# Variations of ship: Myrmidon (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Gallente Battlecruiser").level
diff --git a/eos/effects/shipbonusdronehitpointsgc2.py b/eos/effects/shipbonusdronehitpointsgc2.py
index 052d5c595..7f7924725 100755
--- a/eos/effects/shipbonusdronehitpointsgc2.py
+++ b/eos/effects/shipbonusdronehitpointsgc2.py
@@ -1,6 +1,7 @@
 # Used by:
 # Variations of ship: Vexor (3 of 4)
 # Ship: Gila
+# Ship: Stratios
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Gallente Cruiser").level
diff --git a/eos/effects/shipbonusdronehitpointsgf.py b/eos/effects/shipbonusdronehitpointsgf.py
index 6fa93448e..6a14c3671 100755
--- a/eos/effects/shipbonusdronehitpointsgf.py
+++ b/eos/effects/shipbonusdronehitpointsgf.py
@@ -1,4 +1,5 @@
 # Used by:
+# Ship: Astero
 # Ship: Tristan
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipbonusemshieldresistancecb2.py b/eos/effects/shipbonusemshieldresistancecb2.py
index ede4bdd6e..27a656477 100755
--- a/eos/effects/shipbonusemshieldresistancecb2.py
+++ b/eos/effects/shipbonusemshieldresistancecb2.py
@@ -1,4 +1,5 @@
 # Used by:
+# Ship: Nestor
 # Ship: Rattlesnake
 # Ship: Rokh
 # Ship: Scorpion Navy Issue
diff --git a/eos/effects/shipbonusexplosiveshieldresistancecb2.py b/eos/effects/shipbonusexplosiveshieldresistancecb2.py
index dce81a58e..2a337bd0e 100755
--- a/eos/effects/shipbonusexplosiveshieldresistancecb2.py
+++ b/eos/effects/shipbonusexplosiveshieldresistancecb2.py
@@ -1,4 +1,5 @@
 # Used by:
+# Ship: Nestor
 # Ship: Rattlesnake
 # Ship: Rokh
 # Ship: Scorpion Navy Issue
diff --git a/eos/effects/shipbonusheavyassaultmissilelauncherrofmbc2.py b/eos/effects/shipbonusheavyassaultmissilelauncherrofmbc2.py
index 7681a814d..413feceaf 100644
--- a/eos/effects/shipbonusheavyassaultmissilelauncherrofmbc2.py
+++ b/eos/effects/shipbonusheavyassaultmissilelauncherrofmbc2.py
@@ -1,6 +1,5 @@
 # Used by:
-# Ship: Claymore
-# Ship: Cyclone
+# Variations of ship: Cyclone (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Battlecruiser").level
diff --git a/eos/effects/shipbonusheavymissileemdmgmb.py b/eos/effects/shipbonusheavymissileemdmgmb.py
new file mode 100644
index 000000000..ef868a4a3
--- /dev/null
+++ b/eos/effects/shipbonusheavymissileemdmgmb.py
@@ -0,0 +1,7 @@
+# Used by:
+# Ship: Typhoon Fleet Issue
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Minmatar Battleship").level
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
+                                    "emDamage", ship.getModifiedItemAttr("shipBonusMB") * level)
diff --git a/eos/effects/shipbonusheavymissileexplodmgmb.py b/eos/effects/shipbonusheavymissileexplodmgmb.py
new file mode 100644
index 000000000..de901c18b
--- /dev/null
+++ b/eos/effects/shipbonusheavymissileexplodmgmb.py
@@ -0,0 +1,7 @@
+# Used by:
+# Ship: Typhoon Fleet Issue
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Minmatar Battleship").level
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
+                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusMB") * level)
diff --git a/eos/effects/shipbonusheavymissilekineticdmgmb.py b/eos/effects/shipbonusheavymissilekineticdmgmb.py
new file mode 100644
index 000000000..c32f64334
--- /dev/null
+++ b/eos/effects/shipbonusheavymissilekineticdmgmb.py
@@ -0,0 +1,7 @@
+# Used by:
+# Ship: Typhoon Fleet Issue
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Minmatar Battleship").level
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
+                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusMB") * level)
diff --git a/eos/effects/shipbonusheavymissilelauncherrofmbc2.py b/eos/effects/shipbonusheavymissilelauncherrofmbc2.py
index 43a07f21b..45d3de649 100644
--- a/eos/effects/shipbonusheavymissilelauncherrofmbc2.py
+++ b/eos/effects/shipbonusheavymissilelauncherrofmbc2.py
@@ -1,6 +1,5 @@
 # Used by:
-# Ship: Claymore
-# Ship: Cyclone
+# Variations of ship: Cyclone (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Battlecruiser").level
diff --git a/eos/effects/shipbonusheavymissilethermdmgmb.py b/eos/effects/shipbonusheavymissilethermdmgmb.py
new file mode 100644
index 000000000..4e3522b47
--- /dev/null
+++ b/eos/effects/shipbonusheavymissilethermdmgmb.py
@@ -0,0 +1,7 @@
+# Used by:
+# Ship: Typhoon Fleet Issue
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Minmatar Battleship").level
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
+                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusMB") * level)
diff --git a/eos/effects/shipbonushybridtrackinggf2.py b/eos/effects/shipbonushybridtrackinggf2.py
index b79d891d1..aae71985f 100755
--- a/eos/effects/shipbonushybridtrackinggf2.py
+++ b/eos/effects/shipbonushybridtrackinggf2.py
@@ -1,5 +1,4 @@
 # Used by:
-# Ship: Ares
 # Ship: Federation Navy Comet
 # Ship: Tristan
 type = "passive"
diff --git a/eos/effects/shipbonuskineticshieldresistancecb2.py b/eos/effects/shipbonuskineticshieldresistancecb2.py
index b0780f386..ba57e2d72 100755
--- a/eos/effects/shipbonuskineticshieldresistancecb2.py
+++ b/eos/effects/shipbonuskineticshieldresistancecb2.py
@@ -1,4 +1,5 @@
 # Used by:
+# Ship: Nestor
 # Ship: Rattlesnake
 # Ship: Rokh
 # Ship: Scorpion Navy Issue
diff --git a/eos/effects/interceptor2missilevelocity.py b/eos/effects/shipbonusmissilevelocitycc2.py
old mode 100755
new mode 100644
similarity index 66%
rename from eos/effects/interceptor2missilevelocity.py
rename to eos/effects/shipbonusmissilevelocitycc2.py
index abede36d1..8539ca8b5
--- a/eos/effects/interceptor2missilevelocity.py
+++ b/eos/effects/shipbonusmissilevelocitycc2.py
@@ -1,7 +1,7 @@
 # Used by:
-# Ship: Crow
+# Ship: Cerberus
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Interceptors").level
+    level = fit.character.getSkill("Caldari Cruiser").level
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusInterceptor2") * level)
+                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusCC2") * level)
diff --git a/eos/effects/shipbonusmwdcapneedmf.py b/eos/effects/shipbonusmwdcapneedmf.py
deleted file mode 100755
index a911669e7..000000000
--- a/eos/effects/shipbonusmwdcapneedmf.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# Used by:
-# Ship: Hyena
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Minmatar Frigate").level
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-                                  "capacitorCapacityMultiplier", ship.getModifiedItemAttr("shipBonusMF") * level)
diff --git a/eos/effects/shipbonusprojectiledamagembc1.py b/eos/effects/shipbonusprojectiledamagembc1.py
index e9dc13e4b..947eb19f5 100755
--- a/eos/effects/shipbonusprojectiledamagembc1.py
+++ b/eos/effects/shipbonusprojectiledamagembc1.py
@@ -1,5 +1,5 @@
 # Used by:
-# Variations of ship: Hurricane (2 of 2)
+# Ships named like: Hurricane (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Battlecruiser").level
diff --git a/eos/effects/shipbonusrhmlrofmb.py b/eos/effects/shipbonusrhmlrofmb.py
new file mode 100644
index 000000000..f49d7e05d
--- /dev/null
+++ b/eos/effects/shipbonusrhmlrofmb.py
@@ -0,0 +1,7 @@
+# Used by:
+# Ship: Typhoon
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Minmatar Battleship").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Heavy",
+                                  "speed", ship.getModifiedItemAttr("shipBonusMB") * level)
diff --git a/eos/effects/shipbonusstasiswebspeedfactorab.py b/eos/effects/shipbonusstasiswebspeedfactorab.py
deleted file mode 100755
index 3ade594e8..000000000
--- a/eos/effects/shipbonusstasiswebspeedfactorab.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# Used by:
-# Ship: Paladin
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Amarr Battleship").level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "speedFactor", ship.getModifiedItemAttr("shipBonusAB") * level)
diff --git a/eos/effects/shipbonusstasiswebspeedfactorgb2.py b/eos/effects/shipbonusstasiswebspeedfactorgb2.py
deleted file mode 100755
index e19cbf81e..000000000
--- a/eos/effects/shipbonusstasiswebspeedfactorgb2.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# Used by:
-# Ship: Kronos
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Gallente Battleship").level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "speedFactor", ship.getModifiedItemAttr("shipBonusGB2") * level)
diff --git a/eos/effects/shipbonustargetpainteroptimalmf1.py b/eos/effects/shipbonustargetpainteroptimalmf1.py
index 4559c3614..531c44d3a 100755
--- a/eos/effects/shipbonustargetpainteroptimalmf1.py
+++ b/eos/effects/shipbonustargetpainteroptimalmf1.py
@@ -1,5 +1,5 @@
 # Used by:
-# Ship: Vigil
+# Variations of ship: Vigil (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Frigate").level
diff --git a/eos/effects/shipbonusthermicshieldresistancecb2.py b/eos/effects/shipbonusthermicshieldresistancecb2.py
index c2fba8800..f26a10ef1 100755
--- a/eos/effects/shipbonusthermicshieldresistancecb2.py
+++ b/eos/effects/shipbonusthermicshieldresistancecb2.py
@@ -1,4 +1,5 @@
 # Used by:
+# Ship: Nestor
 # Ship: Rattlesnake
 # Ship: Rokh
 # Ship: Scorpion Navy Issue
diff --git a/eos/effects/shipbonustorpedomissileemdmgmb.py b/eos/effects/shipbonustorpedomissileemdmgmb.py
new file mode 100644
index 000000000..647dcee5d
--- /dev/null
+++ b/eos/effects/shipbonustorpedomissileemdmgmb.py
@@ -0,0 +1,7 @@
+# Used by:
+# Ship: Typhoon Fleet Issue
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Minmatar Battleship").level
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
+                                    "emDamage", ship.getModifiedItemAttr("shipBonusMB") * level)
diff --git a/eos/effects/shipbonustorpedomissileexplodmgmb.py b/eos/effects/shipbonustorpedomissileexplodmgmb.py
new file mode 100644
index 000000000..e52b28129
--- /dev/null
+++ b/eos/effects/shipbonustorpedomissileexplodmgmb.py
@@ -0,0 +1,7 @@
+# Used by:
+# Ship: Typhoon Fleet Issue
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Minmatar Battleship").level
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
+                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusMB") * level)
diff --git a/eos/effects/shipbonustorpedomissilekineticdmgmb.py b/eos/effects/shipbonustorpedomissilekineticdmgmb.py
new file mode 100644
index 000000000..8204781f4
--- /dev/null
+++ b/eos/effects/shipbonustorpedomissilekineticdmgmb.py
@@ -0,0 +1,7 @@
+# Used by:
+# Ship: Typhoon Fleet Issue
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Minmatar Battleship").level
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
+                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusMB") * level)
diff --git a/eos/effects/shipbonustorpedomissilethermdmgmb.py b/eos/effects/shipbonustorpedomissilethermdmgmb.py
new file mode 100644
index 000000000..3bc1efccb
--- /dev/null
+++ b/eos/effects/shipbonustorpedomissilethermdmgmb.py
@@ -0,0 +1,7 @@
+# Used by:
+# Ship: Typhoon Fleet Issue
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Minmatar Battleship").level
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
+                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusMB") * level)
diff --git a/eos/effects/shipbonustorpedorofmb.py b/eos/effects/shipbonustorpedorofmb.py
new file mode 100644
index 000000000..4bd886f09
--- /dev/null
+++ b/eos/effects/shipbonustorpedorofmb.py
@@ -0,0 +1,7 @@
+# Used by:
+# Ship: Typhoon
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Minmatar Battleship").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Torpedo",
+                                  "speed", ship.getModifiedItemAttr("shipBonusMB") * level)
diff --git a/eos/effects/shiphybriddmg1gbc1.py b/eos/effects/shiphybriddmg1gbc1.py
index 069d6f800..c5f6286bb 100755
--- a/eos/effects/shiphybriddmg1gbc1.py
+++ b/eos/effects/shiphybriddmg1gbc1.py
@@ -1,5 +1,5 @@
 # Used by:
-# Variations of ship: Brutix (3 of 4)
+# Variations of ship: Brutix (3 of 3)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Gallente Battlecruiser").level
diff --git a/eos/effects/shiphybridoptimal1cbc1.py b/eos/effects/shiphybridoptimal1cbc1.py
index be7b0e7a5..d26161f5e 100755
--- a/eos/effects/shiphybridoptimal1cbc1.py
+++ b/eos/effects/shiphybridoptimal1cbc1.py
@@ -1,6 +1,5 @@
 # Used by:
-# Ship: Ferox
-# Ship: Vulture
+# Variations of ship: Ferox (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Battlecruiser").level
diff --git a/eos/effects/shiplaserdamagebonusabc2.py b/eos/effects/shiplaserdamagebonusabc2.py
index bf705c9a4..25d1f8990 100755
--- a/eos/effects/shiplaserdamagebonusabc2.py
+++ b/eos/effects/shiplaserdamagebonusabc2.py
@@ -1,5 +1,5 @@
 # Used by:
-# Variations of ship: Harbinger (2 of 2)
+# Ships named like: Harbinger (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Battlecruiser").level
diff --git a/eos/effects/shipmissileassaultmissilevelocitybonuscc2.py b/eos/effects/shipmissileassaultmissilevelocitybonuscc2.py
index 3def24ece..9d3e80c8e 100755
--- a/eos/effects/shipmissileassaultmissilevelocitybonuscc2.py
+++ b/eos/effects/shipmissileassaultmissilevelocitybonuscc2.py
@@ -1,6 +1,5 @@
 # Used by:
 # Ship: Caracal
-# Ship: Cerberus
 # Ship: Osprey Navy Issue
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipmissileheavyvelocitybonuscc2.py b/eos/effects/shipmissileheavyvelocitybonuscc2.py
index f55b6ef40..5c8846da6 100755
--- a/eos/effects/shipmissileheavyvelocitybonuscc2.py
+++ b/eos/effects/shipmissileheavyvelocitybonuscc2.py
@@ -1,6 +1,5 @@
 # Used by:
 # Ship: Caracal
-# Ship: Cerberus
 # Ship: Osprey Navy Issue
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipmissilekineticdamagecf.py b/eos/effects/shipmissilekineticdamagecf.py
index c78196bd5..32cab4966 100755
--- a/eos/effects/shipmissilekineticdamagecf.py
+++ b/eos/effects/shipmissilekineticdamagecf.py
@@ -2,7 +2,6 @@
 # Ship: Buzzard
 # Ship: Caldari Navy Hookbill
 # Ship: Condor
-# Ship: Crow
 # Ship: Hawk
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipmissilelightvelocitybonuscc2.py b/eos/effects/shipmissilelightvelocitybonuscc2.py
index ed86cbeab..5238edbd7 100755
--- a/eos/effects/shipmissilelightvelocitybonuscc2.py
+++ b/eos/effects/shipmissilelightvelocitybonuscc2.py
@@ -1,6 +1,5 @@
 # Used by:
 # Ship: Caracal
-# Ship: Cerberus
 # Ship: Osprey Navy Issue
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipmissilespeedbonusaf.py b/eos/effects/shipmissilespeedbonusaf.py
index a88bc8c4a..817ee37f5 100755
--- a/eos/effects/shipmissilespeedbonusaf.py
+++ b/eos/effects/shipmissilespeedbonusaf.py
@@ -1,4 +1,5 @@
 # Used by:
+# Ship: Malediction
 # Ship: Vengeance
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipmissilevelocitycf.py b/eos/effects/shipmissilevelocitycf.py
index 6cd4b8cfa..3d65fdacd 100755
--- a/eos/effects/shipmissilevelocitycf.py
+++ b/eos/effects/shipmissilevelocitycf.py
@@ -1,4 +1,5 @@
 # Used by:
+# Ship: Crow
 # Ship: Kestrel
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipmissilevelocitypiratefactioncruise.py b/eos/effects/shipmissilevelocitypiratefactioncruise.py
index d5af7a255..ec5470b3c 100755
--- a/eos/effects/shipmissilevelocitypiratefactioncruise.py
+++ b/eos/effects/shipmissilevelocitypiratefactioncruise.py
@@ -1,4 +1,5 @@
 # Used by:
+# Ship: Nestor
 # Ship: Rattlesnake
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipmissilevelocitypiratefactiontorp.py b/eos/effects/shipmissilevelocitypiratefactiontorp.py
index 52b86d0e7..cdd776324 100755
--- a/eos/effects/shipmissilevelocitypiratefactiontorp.py
+++ b/eos/effects/shipmissilevelocitypiratefactiontorp.py
@@ -1,4 +1,5 @@
 # Used by:
+# Ship: Nestor
 # Ship: Rattlesnake
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipprojectilerof1mbc2.py b/eos/effects/shipprojectilerof1mbc2.py
index 4989ed37a..be101574e 100755
--- a/eos/effects/shipprojectilerof1mbc2.py
+++ b/eos/effects/shipprojectilerof1mbc2.py
@@ -1,5 +1,5 @@
 # Used by:
-# Variations of ship: Hurricane (2 of 2)
+# Ships named like: Hurricane (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Battlecruiser").level
diff --git a/eos/effects/shipprojectiletrackingmf2.py b/eos/effects/shipprojectiletrackingmf2.py
index aecedc59a..7d87b1fae 100755
--- a/eos/effects/shipprojectiletrackingmf2.py
+++ b/eos/effects/shipprojectiletrackingmf2.py
@@ -1,8 +1,7 @@
 # Used by:
 # Variations of ship: Rifter (3 of 3)
+# Variations of ship: Slasher (3 of 3)
 # Ship: Republic Fleet Firetail
-# Ship: Slasher
-# Ship: Stiletto
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Frigate").level
diff --git a/eos/effects/shipscanprobestrengthbonuspiratecruiser.py b/eos/effects/shipscanprobestrengthbonuspiratecruiser.py
index 33f7f377c..9803ee888 100755
--- a/eos/effects/shipscanprobestrengthbonuspiratecruiser.py
+++ b/eos/effects/shipscanprobestrengthbonuspiratecruiser.py
@@ -1,5 +1,7 @@
 # Used by:
+# Ship: Astero
 # Ship: Gnosis
+# Ship: Stratios
 type = "passive"
 def handler(fit, container, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
diff --git a/eos/effects/shipshieldboost1mbc1.py b/eos/effects/shipshieldboost1mbc1.py
index b49f3efe8..3e9bd6a6d 100755
--- a/eos/effects/shipshieldboost1mbc1.py
+++ b/eos/effects/shipshieldboost1mbc1.py
@@ -1,5 +1,6 @@
 # Used by:
-# Variations of ship: Cyclone (3 of 3)
+# Variations of ship: Cyclone (2 of 2)
+# Ship: Sleipnir
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Battlecruiser").level
diff --git a/eos/effects/shipshieldemresistance1cbc2.py b/eos/effects/shipshieldemresistance1cbc2.py
index 2d234c442..d538e4a5d 100644
--- a/eos/effects/shipshieldemresistance1cbc2.py
+++ b/eos/effects/shipshieldemresistance1cbc2.py
@@ -1,6 +1,7 @@
 # Used by:
-# Variations of ship: Ferox (3 of 3)
+# Variations of ship: Ferox (2 of 2)
 # Ship: Drake
+# Ship: Nighthawk
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Battlecruiser").level
diff --git a/eos/effects/shipshieldexplosiveresistance1cbc2.py b/eos/effects/shipshieldexplosiveresistance1cbc2.py
index fd34cefb2..6b78b50d2 100644
--- a/eos/effects/shipshieldexplosiveresistance1cbc2.py
+++ b/eos/effects/shipshieldexplosiveresistance1cbc2.py
@@ -1,6 +1,7 @@
 # Used by:
-# Variations of ship: Ferox (3 of 3)
+# Variations of ship: Ferox (2 of 2)
 # Ship: Drake
+# Ship: Nighthawk
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Battlecruiser").level
diff --git a/eos/effects/shipshieldkineticresistance1cbc2.py b/eos/effects/shipshieldkineticresistance1cbc2.py
index d8a690580..3eebfdb90 100644
--- a/eos/effects/shipshieldkineticresistance1cbc2.py
+++ b/eos/effects/shipshieldkineticresistance1cbc2.py
@@ -1,6 +1,7 @@
 # Used by:
-# Variations of ship: Ferox (3 of 3)
+# Variations of ship: Ferox (2 of 2)
 # Ship: Drake
+# Ship: Nighthawk
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Battlecruiser").level
diff --git a/eos/effects/shipshieldthermalresistance1cbc2.py b/eos/effects/shipshieldthermalresistance1cbc2.py
index 6c93db49a..f0d291bae 100644
--- a/eos/effects/shipshieldthermalresistance1cbc2.py
+++ b/eos/effects/shipshieldthermalresistance1cbc2.py
@@ -1,6 +1,7 @@
 # Used by:
-# Variations of ship: Ferox (3 of 3)
+# Variations of ship: Ferox (2 of 2)
 # Ship: Drake
+# Ship: Nighthawk
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Battlecruiser").level
diff --git a/eos/effects/shiprocketemandexpandkinandthmdmgaf.py b/eos/effects/shipsmallmissiledmggf2.py
old mode 100755
new mode 100644
similarity index 58%
rename from eos/effects/shiprocketemandexpandkinandthmdmgaf.py
rename to eos/effects/shipsmallmissiledmggf2.py
index 90ca8e554..d0fe9d31b
--- a/eos/effects/shiprocketemandexpandkinandthmdmgaf.py
+++ b/eos/effects/shipsmallmissiledmggf2.py
@@ -1,9 +1,9 @@
 # Used by:
-# Ship: Malediction
+# Ship: Ares
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Amarr Frigate").level
+    level = fit.character.getSkill("Gallente Frigate").level
     damageTypes = ("em", "explosive", "kinetic", "thermal")
     for damageType in damageTypes:
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                        "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusAF") * level)
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
+                                        "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusGF2") * level)
diff --git a/eos/effects/shipsmallmissilekindmgcf2.py b/eos/effects/shipsmallmissilekindmgcf2.py
index e09a5bec3..40c1b61ff 100755
--- a/eos/effects/shipsmallmissilekindmgcf2.py
+++ b/eos/effects/shipsmallmissilekindmgcf2.py
@@ -1,4 +1,5 @@
 # Used by:
+# Ship: Crow
 # Ship: Kestrel
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/usemissiles.py b/eos/effects/usemissiles.py
index c8effa0a0..269b47ce3 100755
--- a/eos/effects/usemissiles.py
+++ b/eos/effects/usemissiles.py
@@ -2,7 +2,7 @@
 # Modules from group: Missile Launcher Citadel (4 of 4)
 # Modules from group: Missile Launcher Heavy (12 of 12)
 # Modules from group: Missile Launcher Rocket (14 of 14)
-# Modules named like: Launcher (117 of 117)
+# Modules named like: Launcher (136 of 136)
 type = 'active'
 def handler(fit, module, context):
     # Set reload time to 10 seconds