diff --git a/config.py b/config.py
index 72bec710d..ea8b8ee29 100644
--- a/config.py
+++ b/config.py
@@ -15,7 +15,7 @@ saveInRoot = False
 # Version data
 version = "1.5.2"
 tag = "git"
-expansionName = "Oceanus"
+expansionName = "Phoebe"
 expansionVersion = "1.0"
 evemonMinVersion = "4081"
 
diff --git a/eos/effects/addtosignatureradius2.py b/eos/effects/addtosignatureradius2.py
index e6fd9a7ad..658d72b61 100644
--- a/eos/effects/addtosignatureradius2.py
+++ b/eos/effects/addtosignatureradius2.py
@@ -1,6 +1,7 @@
 # addToSignatureRadius2
 #
 # Used by:
+# Modules from group: Missile Launcher Bomb (2 of 2)
 # Modules from group: Shield Extender (37 of 37)
 type = "passive"
 def handler(fit, module, context):
diff --git a/eos/effects/ammoinfluencecapneed.py b/eos/effects/ammoinfluencecapneed.py
index 24758fcd6..c695d8ff3 100644
--- a/eos/effects/ammoinfluencecapneed.py
+++ b/eos/effects/ammoinfluencecapneed.py
@@ -1,7 +1,7 @@
 # ammoInfluenceCapNeed
 #
 # Used by:
-# Items from category: Charge (458 of 828)
+# Items from category: Charge (458 of 829)
 type = "passive"
 def handler(fit, module, context):
     # Dirty hack to work around cap charges setting cap booster
diff --git a/eos/effects/ammoinfluencerange.py b/eos/effects/ammoinfluencerange.py
index 1e5919df8..bb1853379 100644
--- a/eos/effects/ammoinfluencerange.py
+++ b/eos/effects/ammoinfluencerange.py
@@ -1,7 +1,7 @@
 # ammoInfluenceRange
 #
 # Used by:
-# Items from category: Charge (559 of 828)
+# Items from category: Charge (559 of 829)
 type = "passive"
 def handler(fit, module, context):
     module.multiplyItemAttr("maxRange", module.getModifiedChargeAttr("weaponRangeMultiplier"))
\ No newline at end of file
diff --git a/eos/effects/ammospeedmultiplier.py b/eos/effects/ammospeedmultiplier.py
index 606a5f0bf..30438b3f0 100644
--- a/eos/effects/ammospeedmultiplier.py
+++ b/eos/effects/ammospeedmultiplier.py
@@ -2,8 +2,8 @@
 #
 # Used by:
 # Charges from group: Festival Charges (8 of 8)
+# Charges from group: Interdiction Probe (2 of 2)
 # Charges from group: Survey Probe (3 of 3)
-# Charge: Warp Disrupt Probe
 type = "passive"
 def handler(fit, module, context):
     module.multiplyItemAttr("speed", module.getModifiedChargeAttr("speedMultiplier") or 1)
diff --git a/eos/effects/cloaking.py b/eos/effects/cloaking.py
index 2534a3680..e7789d64d 100644
--- a/eos/effects/cloaking.py
+++ b/eos/effects/cloaking.py
@@ -1,7 +1,7 @@
 # cloaking
 #
 # Used by:
-# Modules from group: Cloaking Device (12 of 14)
+# Modules from group: Cloaking Device (10 of 14)
 type = "active"
 runTime = "early"
 #TODO: Rewrite this effect
diff --git a/eos/effects/drawbackarmorhp.py b/eos/effects/drawbackarmorhp.py
index 28d24015e..d60b1369a 100644
--- a/eos/effects/drawbackarmorhp.py
+++ b/eos/effects/drawbackarmorhp.py
@@ -1,7 +1,7 @@
 # drawbackArmorHP
 #
 # Used by:
-# Modules from group: Rig Navigation (48 of 64)
+# Modules from group: Rig Navigation (48 of 68)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.boostItemAttr("armorHP", module.getModifiedItemAttr("drawback"))
\ No newline at end of file
diff --git a/eos/effects/elitebonusheavyinterdictorlaserrof.py b/eos/effects/elitebonusheavyinterdictorlaserrof.py
deleted file mode 100644
index 5e3cc897f..000000000
--- a/eos/effects/elitebonusheavyinterdictorlaserrof.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# eliteBonusHeavyInterdictorLaserRof
-#
-# Used by:
-# Ship: Devoter
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Heavy Interdiction Cruisers").level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "speed", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1") * level)
diff --git a/eos/effects/elitebonusheavyinterdictorshybridfalloff1.py b/eos/effects/elitebonusheavyinterdictorshybridfalloff1.py
deleted file mode 100644
index 751cae2dc..000000000
--- a/eos/effects/elitebonusheavyinterdictorshybridfalloff1.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# eliteBonusHeavyInterdictorsHybridFalloff1
-#
-# Used by:
-# Ship: Phobos
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Heavy Interdiction Cruisers").level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "falloff", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1") * level)
diff --git a/eos/effects/elitebonusmarauderscruiseandtorpedodamagerole1.py b/eos/effects/elitebonusmarauderscruiseandtorpedodamagerole1.py
index 16729828f..ff6dc6f7c 100644
--- a/eos/effects/elitebonusmarauderscruiseandtorpedodamagerole1.py
+++ b/eos/effects/elitebonusmarauderscruiseandtorpedodamagerole1.py
@@ -1,7 +1,7 @@
 # eliteBonusMaraudersCruiseAndTorpedoDamageRole1
 #
 # Used by:
-# Ship: Golem
+# Ships named like: Golem (4 of 4)
 type = "passive"
 def handler(fit, ship, context):
     damageTypes = ("em", "explosive", "kinetic", "thermal")
diff --git a/eos/effects/elitebonusmaraudersheavymissiledamageemrole1.py b/eos/effects/elitebonusmaraudersheavymissiledamageemrole1.py
index 79a74f96e..44ed5ff8f 100644
--- a/eos/effects/elitebonusmaraudersheavymissiledamageemrole1.py
+++ b/eos/effects/elitebonusmaraudersheavymissiledamageemrole1.py
@@ -1,7 +1,7 @@
 # eliteBonusMaraudersHeavyMissileDamageEMRole1
 #
 # Used by:
-# Ship: Golem
+# Ships named like: Golem (4 of 4)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
diff --git a/eos/effects/elitebonusmaraudersheavymissiledamageexprole1.py b/eos/effects/elitebonusmaraudersheavymissiledamageexprole1.py
index 0e928f96d..ee7d8a446 100644
--- a/eos/effects/elitebonusmaraudersheavymissiledamageexprole1.py
+++ b/eos/effects/elitebonusmaraudersheavymissiledamageexprole1.py
@@ -1,7 +1,7 @@
 # eliteBonusMaraudersHeavyMissileDamageExpRole1
 #
 # Used by:
-# Ship: Golem
+# Ships named like: Golem (4 of 4)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
diff --git a/eos/effects/elitebonusmaraudersheavymissiledamagekinrole1.py b/eos/effects/elitebonusmaraudersheavymissiledamagekinrole1.py
index 8b2a9949d..d30f51635 100644
--- a/eos/effects/elitebonusmaraudersheavymissiledamagekinrole1.py
+++ b/eos/effects/elitebonusmaraudersheavymissiledamagekinrole1.py
@@ -1,7 +1,7 @@
 # eliteBonusMaraudersHeavyMissileDamageKinRole1
 #
 # Used by:
-# Ship: Golem
+# Ships named like: Golem (4 of 4)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
diff --git a/eos/effects/elitebonusmaraudersheavymissiledamagethermrole1.py b/eos/effects/elitebonusmaraudersheavymissiledamagethermrole1.py
index cb5f31065..9767646c0 100644
--- a/eos/effects/elitebonusmaraudersheavymissiledamagethermrole1.py
+++ b/eos/effects/elitebonusmaraudersheavymissiledamagethermrole1.py
@@ -1,7 +1,7 @@
 # eliteBonusMaraudersHeavyMissileDamageThermRole1
 #
 # Used by:
-# Ship: Golem
+# Ships named like: Golem (4 of 4)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
diff --git a/eos/effects/elitebonusmaraudershieldbonus2a.py b/eos/effects/elitebonusmaraudershieldbonus2a.py
index fd15a3216..6c95f9651 100644
--- a/eos/effects/elitebonusmaraudershieldbonus2a.py
+++ b/eos/effects/elitebonusmaraudershieldbonus2a.py
@@ -1,8 +1,7 @@
 # eliteBonusMarauderShieldBonus2a
 #
 # Used by:
-# Ship: Golem
-# Ship: Vargur
+# Ships from group: Marauder (8 of 16)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Marauders").level
diff --git a/eos/effects/elitebonusviolatorsewtargetpainting1.py b/eos/effects/elitebonusviolatorsewtargetpainting1.py
index 3bcc86f25..75421d4c7 100644
--- a/eos/effects/elitebonusviolatorsewtargetpainting1.py
+++ b/eos/effects/elitebonusviolatorsewtargetpainting1.py
@@ -1,7 +1,7 @@
 # eliteBonusViolatorsEwTargetPainting1
 #
 # Used by:
-# Ship: Golem
+# Ships named like: Golem (4 of 4)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Marauders").level
diff --git a/eos/effects/elitebonusviolatorslargeenergyturretdamage1.py b/eos/effects/elitebonusviolatorslargeenergyturretdamage1.py
index 19c257162..0f723b757 100644
--- a/eos/effects/elitebonusviolatorslargeenergyturretdamage1.py
+++ b/eos/effects/elitebonusviolatorslargeenergyturretdamage1.py
@@ -1,7 +1,7 @@
 # eliteBonusViolatorsLargeEnergyTurretDamage1
 #
 # Used by:
-# Ship: Paladin
+# Ships named like: Paladin (4 of 4)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Marauders").level
diff --git a/eos/effects/elitebonusviolatorslargeenergyturretdamagerole1.py b/eos/effects/elitebonusviolatorslargeenergyturretdamagerole1.py
index cee1f5fe1..fdc4ebe13 100644
--- a/eos/effects/elitebonusviolatorslargeenergyturretdamagerole1.py
+++ b/eos/effects/elitebonusviolatorslargeenergyturretdamagerole1.py
@@ -1,7 +1,7 @@
 # eliteBonusViolatorsLargeEnergyTurretDamageRole1
 #
 # Used by:
-# Ship: Paladin
+# Ships named like: Paladin (4 of 4)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
diff --git a/eos/effects/elitebonusviolatorslargehybridturretdamagerole1.py b/eos/effects/elitebonusviolatorslargehybridturretdamagerole1.py
index ade06d1a0..9b9be54e0 100644
--- a/eos/effects/elitebonusviolatorslargehybridturretdamagerole1.py
+++ b/eos/effects/elitebonusviolatorslargehybridturretdamagerole1.py
@@ -1,7 +1,7 @@
 # eliteBonusViolatorsLargeHybridTurretDamageRole1
 #
 # Used by:
-# Ship: Kronos
+# Ships named like: Kronos (4 of 4)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
diff --git a/eos/effects/elitebonusviolatorslargehybridturrettracking1.py b/eos/effects/elitebonusviolatorslargehybridturrettracking1.py
index 5c7b1fded..c9de93d25 100644
--- a/eos/effects/elitebonusviolatorslargehybridturrettracking1.py
+++ b/eos/effects/elitebonusviolatorslargehybridturrettracking1.py
@@ -1,7 +1,7 @@
 # eliteBonusViolatorsLargeHybridTurretTracking1
 #
 # Used by:
-# Ship: Kronos
+# Ships named like: Kronos (4 of 4)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Marauders").level
diff --git a/eos/effects/elitebonusviolatorslargeprojectileturretdamagerole1.py b/eos/effects/elitebonusviolatorslargeprojectileturretdamagerole1.py
index 79cf55663..31e63839d 100644
--- a/eos/effects/elitebonusviolatorslargeprojectileturretdamagerole1.py
+++ b/eos/effects/elitebonusviolatorslargeprojectileturretdamagerole1.py
@@ -1,7 +1,7 @@
 # eliteBonusViolatorsLargeProjectileTurretDamageRole1
 #
 # Used by:
-# Ship: Vargur
+# Ships named like: Vargur (4 of 4)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
diff --git a/eos/effects/elitebonusviolatorslargeprojectileturrettracking1.py b/eos/effects/elitebonusviolatorslargeprojectileturrettracking1.py
index ac03e4dcf..2d2c2c19e 100644
--- a/eos/effects/elitebonusviolatorslargeprojectileturrettracking1.py
+++ b/eos/effects/elitebonusviolatorslargeprojectileturrettracking1.py
@@ -1,7 +1,7 @@
 # eliteBonusViolatorsLargeProjectileTurretTracking1
 #
 # Used by:
-# Ship: Vargur
+# Ships named like: Vargur (4 of 4)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Marauders").level
diff --git a/eos/effects/elitebonusviolatorsrepairsystemsarmordamageamount2.py b/eos/effects/elitebonusviolatorsrepairsystemsarmordamageamount2.py
index df97b3405..d8a63625a 100644
--- a/eos/effects/elitebonusviolatorsrepairsystemsarmordamageamount2.py
+++ b/eos/effects/elitebonusviolatorsrepairsystemsarmordamageamount2.py
@@ -1,10 +1,9 @@
-# eliteBonusViolatorsRepairSystemsArmorDamageAmount2
-#
-# Used by:
-# Ship: Kronos
-# Ship: Paladin
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Marauders").level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("eliteBonusViolators2") * level)
+# eliteBonusViolatorsRepairSystemsArmorDamageAmount2
+#
+# Used by:
+# Ships from group: Marauder (8 of 16)
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Marauders").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
+                                  "armorDamageAmount", ship.getModifiedItemAttr("eliteBonusViolators2") * level)
diff --git a/eos/effects/elitebonusviolatorstractorbeammaxrangerole2.py b/eos/effects/elitebonusviolatorstractorbeammaxrangerole2.py
index 724b59f75..1ef90a0ee 100644
--- a/eos/effects/elitebonusviolatorstractorbeammaxrangerole2.py
+++ b/eos/effects/elitebonusviolatorstractorbeammaxrangerole2.py
@@ -1,7 +1,7 @@
 # eliteBonusViolatorsTractorBeamMaxRangeRole2
 #
 # Used by:
-# Ships from group: Marauder (4 of 4)
+# Ships from group: Marauder (16 of 16)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
diff --git a/eos/effects/elitebonusviolatorstractorbeammaxtractorvelocityrole3.py b/eos/effects/elitebonusviolatorstractorbeammaxtractorvelocityrole3.py
index 6985e955e..2ac2ed9d2 100644
--- a/eos/effects/elitebonusviolatorstractorbeammaxtractorvelocityrole3.py
+++ b/eos/effects/elitebonusviolatorstractorbeammaxtractorvelocityrole3.py
@@ -1,7 +1,7 @@
 # eliteBonusViolatorsTractorBeamMaxTractorVelocityRole3
 #
 # Used by:
-# Ships from group: Marauder (4 of 4)
+# Ships from group: Marauder (16 of 16)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
diff --git a/eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py b/eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py
index af931ccc0..febd7cf0d 100644
--- a/eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py
+++ b/eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py
@@ -3,6 +3,7 @@
 # Used by:
 # Implants named like: Eifyr and Co. 'Rogue' Evasive Maneuvering EM (6 of 6)
 # Implants named like: grade Nomad (10 of 12)
+# Modules named like: Higgs Anchor I (4 of 4)
 # Modules named like: Low Friction Nozzle Joints (8 of 8)
 # Implant: Genolution Core Augmentation CA-4
 # Skill: Evasive Maneuvering
diff --git a/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py b/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py
index 016b48c1f..188a237fd 100644
--- a/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py
+++ b/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py
@@ -3,6 +3,7 @@
 # Used by:
 # Implants named like: grade Snake (16 of 18)
 # Modules named like: Auxiliary Thrusters (8 of 8)
+# Modules named like: Higgs Anchor I (4 of 4)
 # Implant: Quafe Zero
 # Skill: Navigation
 type = "passive"
diff --git a/eos/effects/overloadrofbonus.py b/eos/effects/overloadrofbonus.py
index ec570c722..5382e5f2c 100644
--- a/eos/effects/overloadrofbonus.py
+++ b/eos/effects/overloadrofbonus.py
@@ -1,13 +1,13 @@
 # overloadRofBonus
 #
 # Used by:
-# Modules from group: Energy Weapon (100 of 183)
-# Modules from group: Hybrid Weapon (110 of 199)
+# Modules from group: Energy Weapon (100 of 186)
+# Modules from group: Hybrid Weapon (110 of 202)
 # 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 from group: Projectile Weapon (60 of 143)
-# Modules named like: Launcher (122 of 135)
+# Modules from group: Missile Launcher Rocket (15 of 15)
+# Modules from group: Projectile Weapon (60 of 146)
+# Modules named like: Launcher (125 of 138)
 type = "overheat"
 def handler(fit, module, context):
     module.boostItemAttr("speed", module.getModifiedItemAttr("overloadRofBonus"))
diff --git a/eos/effects/overloadselfdamagebonus.py b/eos/effects/overloadselfdamagebonus.py
index 15325756d..0e43c84c1 100644
--- a/eos/effects/overloadselfdamagebonus.py
+++ b/eos/effects/overloadselfdamagebonus.py
@@ -1,9 +1,9 @@
 # overloadSelfDamageBonus
 #
 # Used by:
-# Modules from group: Energy Weapon (83 of 183)
-# Modules from group: Hybrid Weapon (89 of 199)
-# Modules from group: Projectile Weapon (83 of 143)
+# Modules from group: Energy Weapon (86 of 186)
+# Modules from group: Hybrid Weapon (92 of 202)
+# Modules from group: Projectile Weapon (86 of 146)
 type = "overheat"
 def handler(fit, module, context):
     module.boostItemAttr("damageMultiplier", module.getModifiedItemAttr("overloadDamageModifier"))
\ No newline at end of file
diff --git a/eos/effects/overloadselfdurationbonus.py b/eos/effects/overloadselfdurationbonus.py
index cd3315f59..29ede5790 100644
--- a/eos/effects/overloadselfdurationbonus.py
+++ b/eos/effects/overloadselfdurationbonus.py
@@ -9,6 +9,7 @@
 # Modules from group: Remote Capacitor Transmitter (38 of 38)
 # Modules from group: Remote Shield Booster (39 of 39)
 # Modules from group: Smart Bomb (118 of 118)
+# Modules from group: Warp Disrupt Field Generator (2 of 2)
 # Module: QA Remote Armor Repair System - 5 Players
 # Module: QA Shield Transporter - 5 Players
 # Module: Reactive Armor Hardener
diff --git a/eos/effects/overloadselftrackingmodulebonus.py b/eos/effects/overloadselftrackingmodulebonus.py
index 221fe592d..e1ca68807 100644
--- a/eos/effects/overloadselftrackingmodulebonus.py
+++ b/eos/effects/overloadselftrackingmodulebonus.py
@@ -4,7 +4,7 @@
 # Modules from group: Drone Tracking Modules (8 of 8)
 # Modules from group: Remote Tracking Computer (10 of 10)
 # Modules from group: Tracking Computer (14 of 14)
-# Modules from group: Tracking Disruptor (10 of 10)
+# Modules from group: Tracking Disruptor (8 of 8)
 type = "overheat"
 def handler(fit, module, context):
     module.boostItemAttr("maxRangeBonus", module.getModifiedItemAttr("overloadTrackingModuleStrengthBonus"))
diff --git a/eos/effects/projectilefired.py b/eos/effects/projectilefired.py
index 70bfcb18d..63c4927a7 100644
--- a/eos/effects/projectilefired.py
+++ b/eos/effects/projectilefired.py
@@ -1,8 +1,8 @@
 # projectileFired
 #
 # Used by:
-# Modules from group: Hybrid Weapon (199 of 199)
-# Modules from group: Projectile Weapon (143 of 143)
+# Modules from group: Hybrid Weapon (202 of 202)
+# Modules from group: Projectile Weapon (146 of 146)
 type = 'active'
 def handler(fit, module, context):
     rt = module.getModifiedItemAttr("reloadTime")
diff --git a/eos/effects/rolebonusmaraudermjdrreactivationdelaybonus.py b/eos/effects/rolebonusmaraudermjdrreactivationdelaybonus.py
index 9af3bd8eb..e754a6546 100644
--- a/eos/effects/rolebonusmaraudermjdrreactivationdelaybonus.py
+++ b/eos/effects/rolebonusmaraudermjdrreactivationdelaybonus.py
@@ -1,7 +1,7 @@
 # roleBonusMarauderMJDRReactivationDelayBonus
 #
 # Used by:
-# Ships from group: Marauder (4 of 4)
+# Ships from group: Marauder (16 of 16)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Micro Jump Drive",
diff --git a/eos/effects/shiparmoremresistanceac2.py b/eos/effects/shiparmoremresistanceac2.py
index d100224c7..7b937bd73 100644
--- a/eos/effects/shiparmoremresistanceac2.py
+++ b/eos/effects/shiparmoremresistanceac2.py
@@ -1,7 +1,6 @@
 # shipArmorEmResistanceAC2
 #
 # Used by:
-# Ship: Devoter
 # Ship: Maller
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shiparmoremresistancegc2.py b/eos/effects/shiparmoremresistancegc2.py
deleted file mode 100644
index 2ffb2b3af..000000000
--- a/eos/effects/shiparmoremresistancegc2.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# shipArmorEmResistanceGC2
-#
-# Used by:
-# Ship: Phobos
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Gallente Cruiser").level
-    fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("shipBonusGC2") * level)
diff --git a/eos/effects/shiparmoremresistancerookie.py b/eos/effects/shiparmoremresistancerookie.py
index a2b51dc29..c35e701d3 100644
--- a/eos/effects/shiparmoremresistancerookie.py
+++ b/eos/effects/shiparmoremresistancerookie.py
@@ -1,7 +1,9 @@
 # shipArmorEMResistanceRookie
 #
 # Used by:
+# Ship: Devoter
 # Ship: Impairor
+# Ship: Phobos
 type = "passive"
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("rookieArmorResistanceBonus"))
diff --git a/eos/effects/shiparmorexplosiveresistanceac2.py b/eos/effects/shiparmorexplosiveresistanceac2.py
index c750511a1..9d8094d0a 100644
--- a/eos/effects/shiparmorexplosiveresistanceac2.py
+++ b/eos/effects/shiparmorexplosiveresistanceac2.py
@@ -1,7 +1,6 @@
 # shipArmorExplosiveResistanceAC2
 #
 # Used by:
-# Ship: Devoter
 # Ship: Maller
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shiparmorexplosiveresistancegc2.py b/eos/effects/shiparmorexplosiveresistancegc2.py
deleted file mode 100644
index 06c199b95..000000000
--- a/eos/effects/shiparmorexplosiveresistancegc2.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# shipArmorExplosiveResistanceGC2
-#
-# Used by:
-# Ship: Phobos
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Gallente Cruiser").level
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusGC2") * level)
diff --git a/eos/effects/shiparmorexresistancerookie.py b/eos/effects/shiparmorexresistancerookie.py
index 082910f84..a0f2becf6 100644
--- a/eos/effects/shiparmorexresistancerookie.py
+++ b/eos/effects/shiparmorexresistancerookie.py
@@ -1,7 +1,9 @@
 # shipArmorEXResistanceRookie
 #
 # Used by:
+# Ship: Devoter
 # Ship: Impairor
+# Ship: Phobos
 type = "passive"
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("rookieArmorResistanceBonus"))
diff --git a/eos/effects/shiparmorkineticresistanceac2.py b/eos/effects/shiparmorkineticresistanceac2.py
index 08059f5d6..974835cab 100644
--- a/eos/effects/shiparmorkineticresistanceac2.py
+++ b/eos/effects/shiparmorkineticresistanceac2.py
@@ -1,7 +1,6 @@
 # shipArmorKineticResistanceAC2
 #
 # Used by:
-# Ship: Devoter
 # Ship: Maller
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shiparmorkineticresistancegc2.py b/eos/effects/shiparmorkineticresistancegc2.py
deleted file mode 100644
index be1157f32..000000000
--- a/eos/effects/shiparmorkineticresistancegc2.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# shipArmorKineticResistanceGC2
-#
-# Used by:
-# Ship: Phobos
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Gallente Cruiser").level
-    fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("shipBonusGC2") * level)
diff --git a/eos/effects/shiparmorknresistancerookie.py b/eos/effects/shiparmorknresistancerookie.py
index 98e071074..d3f68efa4 100644
--- a/eos/effects/shiparmorknresistancerookie.py
+++ b/eos/effects/shiparmorknresistancerookie.py
@@ -1,7 +1,9 @@
 # shipArmorKNResistanceRookie
 #
 # Used by:
+# Ship: Devoter
 # Ship: Impairor
+# Ship: Phobos
 type = "passive"
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("rookieArmorResistanceBonus"))
diff --git a/eos/effects/shiparmorthermalresistanceac2.py b/eos/effects/shiparmorthermalresistanceac2.py
index fbf19b7aa..7fca5a7c9 100644
--- a/eos/effects/shiparmorthermalresistanceac2.py
+++ b/eos/effects/shiparmorthermalresistanceac2.py
@@ -1,7 +1,6 @@
 # shipArmorThermalResistanceAC2
 #
 # Used by:
-# Ship: Devoter
 # Ship: Maller
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shiparmorthermalresistancegc2.py b/eos/effects/shiparmorthermalresistancegc2.py
deleted file mode 100644
index 1b4ef3f2a..000000000
--- a/eos/effects/shiparmorthermalresistancegc2.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# shipArmorThermalResistanceGC2
-#
-# Used by:
-# Ship: Phobos
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Gallente Cruiser").level
-    fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("shipBonusGC2") * level)
diff --git a/eos/effects/shiparmorthresistancerookie.py b/eos/effects/shiparmorthresistancerookie.py
index f8219e97c..c5fe4045f 100644
--- a/eos/effects/shiparmorthresistancerookie.py
+++ b/eos/effects/shiparmorthresistancerookie.py
@@ -1,7 +1,9 @@
 # shipArmorTHResistanceRookie
 #
 # Used by:
+# Ship: Devoter
 # Ship: Impairor
+# Ship: Phobos
 type = "passive"
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("rookieArmorResistanceBonus"))
diff --git a/eos/effects/shipbonusaoevelocitycruiseandtorpedocb2.py b/eos/effects/shipbonusaoevelocitycruiseandtorpedocb2.py
index 75678d3f3..545c04b1b 100644
--- a/eos/effects/shipbonusaoevelocitycruiseandtorpedocb2.py
+++ b/eos/effects/shipbonusaoevelocitycruiseandtorpedocb2.py
@@ -1,7 +1,7 @@
 # shipBonusAoeVelocityCruiseAndTorpedoCB2
 #
 # Used by:
-# Ship: Golem
+# Ships named like: Golem (4 of 4)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Battleship").level
diff --git a/eos/effects/shipbonuscapcapab.py b/eos/effects/shipbonuscapcapab.py
index 39104bcf1..32e9029e2 100644
--- a/eos/effects/shipbonuscapcapab.py
+++ b/eos/effects/shipbonuscapcapab.py
@@ -1,8 +1,8 @@
 # shipBonusCapCapAB
 #
 # Used by:
+# Ships named like: Paladin (4 of 4)
 # Ship: Apocalypse Imperial Issue
-# Ship: Paladin
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Battleship").level
diff --git a/eos/effects/shipbonushtfalloffgb2.py b/eos/effects/shipbonushtfalloffgb2.py
index 449d46d8c..c6a9db3f9 100644
--- a/eos/effects/shipbonushtfalloffgb2.py
+++ b/eos/effects/shipbonushtfalloffgb2.py
@@ -1,7 +1,7 @@
 # shipBonusHTFalloffGB2
 #
 # Used by:
-# Ship: Kronos
+# Ships named like: Kronos (4 of 4)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Gallente Battleship").level
diff --git a/eos/effects/shipbonuslargeenergyturretmaxrangeab.py b/eos/effects/shipbonuslargeenergyturretmaxrangeab.py
index 90e39e39a..eff96e4a8 100644
--- a/eos/effects/shipbonuslargeenergyturretmaxrangeab.py
+++ b/eos/effects/shipbonuslargeenergyturretmaxrangeab.py
@@ -1,7 +1,7 @@
 # shipBonusLargeEnergyTurretMaxRangeAB
 #
 # Used by:
-# Ship: Paladin
+# Ships named like: Paladin (4 of 4)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Battleship").level
diff --git a/eos/effects/shipbonuslargeenergyturretmaxrangeab2.py b/eos/effects/shipbonuslargeenergyturretmaxrangeab2.py
index 14b92c06b..6234e18aa 100644
--- a/eos/effects/shipbonuslargeenergyturretmaxrangeab2.py
+++ b/eos/effects/shipbonuslargeenergyturretmaxrangeab2.py
@@ -1,8 +1,7 @@
 # shipBonusLargeEnergyTurretMaxRangeAB2
 #
 # Used by:
-# Ship: Apocalypse
-# Ship: Apocalypse Navy Issue
+# Ships named like: Apocalypse (5 of 6)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Battleship").level
diff --git a/eos/effects/shipbonuslargeenergyturrettrackingab.py b/eos/effects/shipbonuslargeenergyturrettrackingab.py
index 4e4b5dfb5..af576a600 100644
--- a/eos/effects/shipbonuslargeenergyturrettrackingab.py
+++ b/eos/effects/shipbonuslargeenergyturrettrackingab.py
@@ -1,8 +1,7 @@
 # shipBonusLargeEnergyTurretTrackingAB
 #
 # Used by:
-# Ship: Apocalypse
-# Ship: Apocalypse Navy Issue
+# Ships named like: Apocalypse (5 of 6)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Battleship").level
diff --git a/eos/effects/shipbonusptfalloffmb1.py b/eos/effects/shipbonusptfalloffmb1.py
index d4ac35b16..bea62b809 100644
--- a/eos/effects/shipbonusptfalloffmb1.py
+++ b/eos/effects/shipbonusptfalloffmb1.py
@@ -1,7 +1,7 @@
 # shipBonusPTFalloffMB1
 #
 # Used by:
-# Ship: Vargur
+# Ships named like: Vargur (4 of 4)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Battleship").level
diff --git a/eos/effects/shipbonusrhmlrof2cb.py b/eos/effects/shipbonusrhmlrof2cb.py
index bbbc91a77..215c28ef0 100644
--- a/eos/effects/shipbonusrhmlrof2cb.py
+++ b/eos/effects/shipbonusrhmlrof2cb.py
@@ -1,6 +1,7 @@
 # shipBonusRHMLROF2CB
 #
 # Used by:
+# Ships named like: Raven Edition (3 of 3)
 # Ship: Raven
 # Ship: Widow
 type = "passive"
diff --git a/eos/effects/shipcruiseandtorpedovelocitybonuscb3.py b/eos/effects/shipcruiseandtorpedovelocitybonuscb3.py
index 2978381b9..817ef9dfa 100644
--- a/eos/effects/shipcruiseandtorpedovelocitybonuscb3.py
+++ b/eos/effects/shipcruiseandtorpedovelocitybonuscb3.py
@@ -1,7 +1,7 @@
 # shipCruiseAndTorpedoVelocityBonusCB3
 #
 # Used by:
-# Ship: Golem
+# Ships named like: Golem (4 of 4)
 # Ship: Widow
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipcruiselauncherrofbonus2cb.py b/eos/effects/shipcruiselauncherrofbonus2cb.py
index 555657a25..8ad0ca847 100644
--- a/eos/effects/shipcruiselauncherrofbonus2cb.py
+++ b/eos/effects/shipcruiselauncherrofbonus2cb.py
@@ -1,8 +1,7 @@
 # shipCruiseLauncherROFBonus2CB
 #
 # Used by:
-# Ship: Raven
-# Ship: Raven State Issue
+# Ships named like: Raven (5 of 6)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Battleship").level
diff --git a/eos/effects/shipcruisemissilevelocitybonuscb3.py b/eos/effects/shipcruisemissilevelocitybonuscb3.py
index faa6bbb63..f9d3939da 100644
--- a/eos/effects/shipcruisemissilevelocitybonuscb3.py
+++ b/eos/effects/shipcruisemissilevelocitybonuscb3.py
@@ -1,7 +1,7 @@
 # shipCruiseMissileVelocityBonusCB3
 #
 # Used by:
-# Variations of ship: Raven (3 of 4)
+# Ships named like: Raven (6 of 6)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Battleship").level
diff --git a/eos/effects/shiphtdmgbonusfixedgc.py b/eos/effects/shiphtdmgbonusfixedgc.py
index a8c7d9b0b..c0fac0f09 100644
--- a/eos/effects/shiphtdmgbonusfixedgc.py
+++ b/eos/effects/shiphtdmgbonusfixedgc.py
@@ -2,9 +2,9 @@
 #
 # Used by:
 # Ships named like: Thorax (3 of 3)
-# Variations of ship: Thorax (3 of 4)
 # Ship: Adrestia
 # Ship: Arazu
+# Ship: Deimos
 # Ship: Exequror Navy Issue
 # Ship: Guardian-Vexor
 # Ship: Lachesis
diff --git a/eos/effects/shiphtdmgbonusgb.py b/eos/effects/shiphtdmgbonusgb.py
index 98a5a273c..9e7b19343 100644
--- a/eos/effects/shiphtdmgbonusgb.py
+++ b/eos/effects/shiphtdmgbonusgb.py
@@ -2,8 +2,8 @@
 #
 # Used by:
 # Ships named like: Hyperion (3 of 3)
+# Ships named like: Kronos (4 of 4)
 # Ship: Dominix Navy Issue
-# Ship: Kronos
 # Ship: Megathron Federate Issue
 # Ship: Sin
 type = "passive"
diff --git a/eos/effects/shiphttrackingbonusgb2.py b/eos/effects/shiphttrackingbonusgb2.py
index 27b962f89..3e527ca67 100644
--- a/eos/effects/shiphttrackingbonusgb2.py
+++ b/eos/effects/shiphttrackingbonusgb2.py
@@ -1,7 +1,7 @@
 # shipHTTrackingBonusGB2
 #
 # Used by:
-# Ships named like: Megathron (4 of 4)
+# Ships named like: Megathron (6 of 6)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Gallente Battleship").level
diff --git a/eos/effects/shiphybridturretrofbonusgc2.py b/eos/effects/shiphybridturretrofbonusgc2.py
index 3a255c43f..c23549bd4 100644
--- a/eos/effects/shiphybridturretrofbonusgc2.py
+++ b/eos/effects/shiphybridturretrofbonusgc2.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Exequror Navy Issue
+# Ship: Phobos
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Gallente Cruiser").level
diff --git a/eos/effects/shiplargehybridturretrofgb.py b/eos/effects/shiplargehybridturretrofgb.py
index 7e60e0733..999b644ae 100644
--- a/eos/effects/shiplargehybridturretrofgb.py
+++ b/eos/effects/shiplargehybridturretrofgb.py
@@ -1,7 +1,7 @@
 # shipLargeHybridTurretRofGB
 #
 # Used by:
-# Ships named like: Megathron (3 of 4)
+# Ships named like: Megathron (5 of 6)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Gallente Battleship").level
diff --git a/eos/effects/shipmissilelauncherrofad1.py b/eos/effects/shipmissilelauncherrofad1.py
deleted file mode 100644
index 905dff31c..000000000
--- a/eos/effects/shipmissilelauncherrofad1.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipMissileLauncherRoFAD1
-#
-# Used by:
-# Ship: Heretic
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Amarr Destroyer").level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusAD1") * level)
\ No newline at end of file
diff --git a/eos/effects/shipprojectiledmgmc2.py b/eos/effects/shipprojectiledmgmc2.py
index 24e2de39f..5a540a679 100644
--- a/eos/effects/shipprojectiledmgmc2.py
+++ b/eos/effects/shipprojectiledmgmc2.py
@@ -1,10 +1,9 @@
 # shipProjectileDmgMC2
 #
 # Used by:
+# Variations of ship: Rupture (3 of 3)
 # Ship: Cynabal
 # Ship: Moracha
-# Ship: Muninn
-# Ship: Rupture
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Cruiser").level
diff --git a/eos/effects/shipptdmgbonusmb.py b/eos/effects/shipptdmgbonusmb.py
index 19d3c5744..ef4e66b65 100644
--- a/eos/effects/shipptdmgbonusmb.py
+++ b/eos/effects/shipptdmgbonusmb.py
@@ -1,7 +1,7 @@
 # shipPTDmgBonusMB
 #
 # Used by:
-# Variations of ship: Tempest (3 of 4)
+# Ships named like: Tempest (6 of 6)
 # Ship: Machariel
 # Ship: Panther
 type = "passive"
diff --git a/eos/effects/shipptspeedbonusmb2.py b/eos/effects/shipptspeedbonusmb2.py
index 64497d724..8cdb3128b 100644
--- a/eos/effects/shipptspeedbonusmb2.py
+++ b/eos/effects/shipptspeedbonusmb2.py
@@ -2,6 +2,8 @@
 #
 # Used by:
 # Ships named like: Maelstrom (3 of 3)
+# Ships named like: Tempest Edition (3 of 3)
+# Ships named like: Vargur Edition (3 of 3)
 # Variations of ship: Tempest (4 of 4)
 # Ship: Panther
 # Ship: Typhoon Fleet Issue
diff --git a/eos/effects/shipshieldemresistancecc2.py b/eos/effects/shipshieldemresistancecc2.py
index 909736ab5..4d5f640dd 100644
--- a/eos/effects/shipshieldemresistancecc2.py
+++ b/eos/effects/shipshieldemresistancecc2.py
@@ -1,7 +1,7 @@
 # shipShieldEMResistanceCC2
 #
 # Used by:
-# Variations of ship: Moa (4 of 4)
+# Variations of ship: Moa (3 of 4)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Cruiser").level
diff --git a/eos/effects/shipshieldemresistancemc2.py b/eos/effects/shipshieldemresistancemc2.py
deleted file mode 100644
index b109ec04d..000000000
--- a/eos/effects/shipshieldemresistancemc2.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# shipShieldEmResistanceMC2
-#
-# Used by:
-# Ship: Broadsword
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Minmatar Cruiser").level
-    fit.ship.boostItemAttr("shieldEmDamageResonance", ship.getModifiedItemAttr("shipBonusMC2") * level)
diff --git a/eos/effects/shipshieldemresistancerookie.py b/eos/effects/shipshieldemresistancerookie.py
index 0840a13c5..e0e1b7f82 100644
--- a/eos/effects/shipshieldemresistancerookie.py
+++ b/eos/effects/shipshieldemresistancerookie.py
@@ -1,7 +1,9 @@
 # shipShieldEMResistanceRookie
 #
 # Used by:
+# Ship: Broadsword
 # Ship: Ibis
+# Ship: Onyx
 # Ship: Taipan
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipshieldexplosiveresistancecc2.py b/eos/effects/shipshieldexplosiveresistancecc2.py
index cf969f09f..4f2a117b3 100644
--- a/eos/effects/shipshieldexplosiveresistancecc2.py
+++ b/eos/effects/shipshieldexplosiveresistancecc2.py
@@ -1,7 +1,7 @@
 # shipShieldExplosiveResistanceCC2
 #
 # Used by:
-# Variations of ship: Moa (4 of 4)
+# Variations of ship: Moa (3 of 4)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Cruiser").level
diff --git a/eos/effects/shipshieldexplosiveresistancemc2.py b/eos/effects/shipshieldexplosiveresistancemc2.py
deleted file mode 100644
index d8de148cd..000000000
--- a/eos/effects/shipshieldexplosiveresistancemc2.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# shipShieldExplosiveResistanceMC2
-#
-# Used by:
-# Ship: Broadsword
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Minmatar Cruiser").level
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusMC2") * level)
diff --git a/eos/effects/shipshieldexplosiveresistancerookie.py b/eos/effects/shipshieldexplosiveresistancerookie.py
index 1d5d3a53a..9b95a0429 100644
--- a/eos/effects/shipshieldexplosiveresistancerookie.py
+++ b/eos/effects/shipshieldexplosiveresistancerookie.py
@@ -1,7 +1,9 @@
 # shipShieldExplosiveResistanceRookie
 #
 # Used by:
+# Ship: Broadsword
 # Ship: Ibis
+# Ship: Onyx
 # Ship: Taipan
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipshieldkineticresistancecc2.py b/eos/effects/shipshieldkineticresistancecc2.py
index bb2407b01..c64f38df8 100644
--- a/eos/effects/shipshieldkineticresistancecc2.py
+++ b/eos/effects/shipshieldkineticresistancecc2.py
@@ -1,7 +1,7 @@
 # shipShieldKineticResistanceCC2
 #
 # Used by:
-# Variations of ship: Moa (4 of 4)
+# Variations of ship: Moa (3 of 4)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Cruiser").level
diff --git a/eos/effects/shipshieldkineticresistancemc2.py b/eos/effects/shipshieldkineticresistancemc2.py
deleted file mode 100644
index 8316a4c18..000000000
--- a/eos/effects/shipshieldkineticresistancemc2.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# shipShieldKineticResistanceMC2
-#
-# Used by:
-# Ship: Broadsword
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Minmatar Cruiser").level
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("shipBonusMC2") * level)
diff --git a/eos/effects/shipshieldkineticresistancerookie.py b/eos/effects/shipshieldkineticresistancerookie.py
index a6affed61..a7b4e2b0b 100644
--- a/eos/effects/shipshieldkineticresistancerookie.py
+++ b/eos/effects/shipshieldkineticresistancerookie.py
@@ -1,7 +1,9 @@
 # shipShieldKineticResistanceRookie
 #
 # Used by:
+# Ship: Broadsword
 # Ship: Ibis
+# Ship: Onyx
 # Ship: Taipan
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipshieldthermalresistancecc2.py b/eos/effects/shipshieldthermalresistancecc2.py
index 2ce17fc5a..85156dda0 100644
--- a/eos/effects/shipshieldthermalresistancecc2.py
+++ b/eos/effects/shipshieldthermalresistancecc2.py
@@ -1,7 +1,7 @@
 # shipShieldThermalResistanceCC2
 #
 # Used by:
-# Variations of ship: Moa (4 of 4)
+# Variations of ship: Moa (3 of 4)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Cruiser").level
diff --git a/eos/effects/shipshieldthermalresistancemc2.py b/eos/effects/shipshieldthermalresistancemc2.py
deleted file mode 100644
index 0b1eea60d..000000000
--- a/eos/effects/shipshieldthermalresistancemc2.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# shipShieldThermalResistanceMC2
-#
-# Used by:
-# Ship: Broadsword
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Minmatar Cruiser").level
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("shipBonusMC2") * level)
diff --git a/eos/effects/shipshieldthermalresistancerookie.py b/eos/effects/shipshieldthermalresistancerookie.py
index d62cfbc8a..74f1cc7f6 100644
--- a/eos/effects/shipshieldthermalresistancerookie.py
+++ b/eos/effects/shipshieldthermalresistancerookie.py
@@ -1,7 +1,9 @@
 # shipShieldThermalResistanceRookie
 #
 # Used by:
+# Ship: Broadsword
 # Ship: Ibis
+# Ship: Onyx
 # Ship: Taipan
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipsiegelauncherrofbonus2cb.py b/eos/effects/shipsiegelauncherrofbonus2cb.py
index 7f4eb514a..af9ca6851 100644
--- a/eos/effects/shipsiegelauncherrofbonus2cb.py
+++ b/eos/effects/shipsiegelauncherrofbonus2cb.py
@@ -1,8 +1,7 @@
 # shipSiegeLauncherROFBonus2CB
 #
 # Used by:
-# Ship: Raven
-# Ship: Raven State Issue
+# Ships named like: Raven (5 of 6)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Battleship").level
diff --git a/eos/effects/shiptorpedosvelocitybonuscb3.py b/eos/effects/shiptorpedosvelocitybonuscb3.py
index 227b32093..69de71c7c 100644
--- a/eos/effects/shiptorpedosvelocitybonuscb3.py
+++ b/eos/effects/shiptorpedosvelocitybonuscb3.py
@@ -1,7 +1,7 @@
 # shipTorpedosVelocityBonusCB3
 #
 # Used by:
-# Variations of ship: Raven (3 of 4)
+# Ships named like: Raven (6 of 6)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Battleship").level
diff --git a/eos/effects/targetattack.py b/eos/effects/targetattack.py
index 742ce576d..3403c880b 100644
--- a/eos/effects/targetattack.py
+++ b/eos/effects/targetattack.py
@@ -3,7 +3,7 @@
 # Used by:
 # Drones from group: Combat Drone (74 of 74)
 # Drones from group: Fighter Drone (4 of 4)
-# Modules from group: Energy Weapon (183 of 183)
+# Modules from group: Energy Weapon (186 of 186)
 type = 'active'
 def handler(fit, module, context):
     # Set reload time to 1 second
diff --git a/eos/effects/targetgunnerymaxrangeandtrackingspeedandfalloffbonushostile.py b/eos/effects/targetgunnerymaxrangeandtrackingspeedandfalloffbonushostile.py
index 772dd76c8..8d135d290 100644
--- a/eos/effects/targetgunnerymaxrangeandtrackingspeedandfalloffbonushostile.py
+++ b/eos/effects/targetgunnerymaxrangeandtrackingspeedandfalloffbonushostile.py
@@ -1,7 +1,7 @@
 # targetGunneryMaxRangeAndTrackingSpeedAndFalloffBonusHostile
 #
 # Used by:
-# Modules from group: Tracking Disruptor (10 of 10)
+# Modules from group: Tracking Disruptor (8 of 8)
 type= "projected", "active"
 def handler(fit, module, context):
     if "projected" in context:
diff --git a/eos/effects/usemissiles.py b/eos/effects/usemissiles.py
index d167d9147..e4fe779de 100644
--- a/eos/effects/usemissiles.py
+++ b/eos/effects/usemissiles.py
@@ -3,8 +3,8 @@
 # Used by:
 # 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 (135 of 135)
+# Modules from group: Missile Launcher Rocket (15 of 15)
+# Modules named like: Launcher (138 of 138)
 type = 'active'
 def handler(fit, module, context):
     # Set reload time to 10 seconds
diff --git a/gui/builtinContextMenus/moduleGlobalAmmoPicker.py b/gui/builtinContextMenus/moduleGlobalAmmoPicker.py
index 65aa4b433..61893819c 100644
--- a/gui/builtinContextMenus/moduleGlobalAmmoPicker.py
+++ b/gui/builtinContextMenus/moduleGlobalAmmoPicker.py
@@ -42,8 +42,13 @@ class ModuleGlobalAmmoPicker(ModuleAmmoPicker):
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
 
     def display(self, srcContext, selection):
-        if selection is None or len(selection) != 1:
-            return False
+        try:
+            selectionLen = len(selection)
+        except:
+            pass
+        else:
+            if selectionLen != 1:
+                return False
 
         return super(ModuleGlobalAmmoPicker, self).display(srcContext, selection)
 
diff --git a/gui/itemStats.py b/gui/itemStats.py
index 36c07e7fa..b721b75b6 100644
--- a/gui/itemStats.py
+++ b/gui/itemStats.py
@@ -221,7 +221,6 @@ class ItemTraits ( wx.Panel ):
         self.SetSizer(mainSizer)
 
         self.traits = wx.html.HtmlWindow(self)
-        print(item.traits)
         self.traits.SetPage(item.traits.traitText)
 
         mainSizer.Add(self.traits, 1, wx.ALL|wx.EXPAND, 0)
diff --git a/service/conversions/skinnedShips.py b/service/conversions/skinnedShips.py
index 074ac29d2..4184b544a 100644
--- a/service/conversions/skinnedShips.py
+++ b/service/conversions/skinnedShips.py
@@ -10,6 +10,9 @@ CONVERSIONS = {
     "Abaddon Kador Edition": "Abaddon",
     "Abaddon Tash-Murkon Edition": "Abaddon",
     "Aliastra Catalyst": "Catalyst",
+    "Apocalypse Blood Raider Edition": "Apocalypse",
+    "Apocalypse Kador Edition": "Apocalypse",
+    "Apocalypse Tash-Murkon Edition": "Apocalypse",
     "Bestower Tash-Murkon Edition": "Bestower",
     "Brutix Serpentis Edition": "Brutix",
     "Caracal Nugoeihuvi Edition": "Caracal",
@@ -19,6 +22,9 @@ CONVERSIONS = {
     "Cormorant Guristas Edition": "Cormorant",
     "Cyclone Thukker Tribe Edition": "Cyclone",
     "Ferox Guristas Edition": "Ferox",
+    "Golem Guristas Edition": "Golem",
+    "Golem Kaalakiota Edition": "Golem",
+    "Golem Nugoeihuvi Edition": "Golem",
     "Hyperion Aliastra Edition": "Hyperion",
     "Hyperion Innerzone Shipping Edition": "Hyperion",
     "Incursus Aliastra Edition": "Incursus",
@@ -28,10 +34,15 @@ CONVERSIONS = {
     "Intaki Syndicate Catalyst": "Catalyst",
     "InterBus Catalyst": "Catalyst",
     "Iteron Inner Zone Shipping Edition": "Iteron Mark V",
+    "Kronos Innerzone Shipping Edition": "Kronos",
+    "Kronos Police Edition": "Kronos",
+    "Kronos Quafe Edition": "Kronos",
     "Mackinaw ORE Development Edition": "Mackinaw",
     "Maelstrom Krusual Edition": "Maelstrom",
     "Maelstrom Nefantar Edition": "Maelstrom",
     "Mammoth Nefantar Edition": "Mammoth",
+    "Megathron Innerzone Shipping Edition": "Megathron",
+    "Megathron Police Edition": "Megathron",
     "Merlin Nugoeihuvi Edition": "Merlin",
     "Merlin Wiyrkomi Edition": "Merlin",
     "Miasmos Amastris Edition": "Miasmos Quafe Ultra Edition",
@@ -40,11 +51,17 @@ CONVERSIONS = {
     "Omen Kador Edition": "Omen",
     "Omen Tash-Murkon Edition": "Omen",
     "Orca ORE Development Edition": "Orca",
+    "Paladin Blood Raider Edition": "Paladin",
+    "Paladin Kador Edition": "Paladin",
+    "Paladin Tash-Murkon Edition": "Paladin",
     "Police Pursuit Comet": "Federation Navy Comet",
     "Prophecy Blood Raiders Edition": "Prophecy",
     "Punisher Kador Edition": "Punisher",
     "Punisher Tash-Murkon Edition": "Punisher",
     "Quafe Catalyst": "Catalyst",
+    "Raven Guristas Edition": "Raven",
+    "Raven Kaalakiota Edition": "Raven",
+    "Raven Nugoeihuvi Edition": "Raven",
     "Rifter Krusual Edition": "Rifter",
     "Rifter Nefantar Edition": "Rifter",
     "Rokh Nugoeihuvi Edition": "Rokh",
@@ -56,8 +73,14 @@ CONVERSIONS = {
     "Sukuuvestaa Heron": "Heron",
     "Tash-Murkon Magnate": "Magnate",
     "Tayra Wiyrkomi Edition": "Tayra",
+    "Tempest Justice Edition": "Tempest",
+    "Tempest Krusual Edition": "Tempest",
+    "Tempest Nefantar Edition": "Tempest",
     "Thorax Aliastra Edition": "Thorax",
     "Thorax Innerzone Shipping Edition": "Thorax",
     "Thrasher Thukker Tribe Edition": "Thrasher",
+    "Vargur Justice Edition": "Vargur",
+    "Vargur Krusual Edition": "Vargur",
+    "Vargur Nefantar Edition": "Vargur",
     "Vherokior Probe": "Probe"
 }
diff --git a/service/market.py b/service/market.py
index 6e2bccdc0..257d0d477 100644
--- a/service/market.py
+++ b/service/market.py
@@ -201,7 +201,6 @@ class Market():
         # List of items which are forcibly published or hidden
         self.ITEMS_FORCEPUBLISHED = {
             "Data Subverter I": False, # Not used in EVE, probably will appear with Dust link
-            "Ghost Heavy Missile": False, # Missile used by Sansha
             "QA Cross Protocol Analyzer": False, # QA modules used by CCP internally
             "QA Damage Module": False,
             "QA ECCM": False,
@@ -233,8 +232,6 @@ class Market():
             "Medium Nano Armor Repair Unit I": ("Tech I", "Medium Armor Repairer I"),
             "Large 'Reprieve' Vestment Reconstructer I": ("Storyline", "Large Armor Repairer I"),
             "Khanid Navy Torpedo Launcher": ("Faction", "Torpedo Launcher I"),
-            "Dark Blood Tracking Disruptor": ("Faction", "Tracking Disruptor I"),
-            "True Sansha Tracking Disruptor": ("Faction", "Tracking Disruptor I"),
             "Shadow Serpentis Remote Sensor Dampener": ("Faction", "Remote Sensor Dampener I") }
         # Parent type name: set(item names)
         self.ITEMS_FORCEDMETAGROUP_R = {}
diff --git a/staticdata/eve.db b/staticdata/eve.db
index 2c4cd5e88..01c0a0058 100644
Binary files a/staticdata/eve.db and b/staticdata/eve.db differ