diff --git a/eos/effects/boostershieldcapacitypenalty.py b/eos/effects/boostershieldcapacitypenalty.py
index 9258da2c5..6e0b11eb7 100644
--- a/eos/effects/boostershieldcapacitypenalty.py
+++ b/eos/effects/boostershieldcapacitypenalty.py
@@ -1,7 +1,7 @@
 # boosterShieldCapacityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 65)
+# Implants named like: Booster (12 of 33)
 type = "boosterSideEffect"
 
 # User-friendly name for the side effect
diff --git a/eos/effects/commandburstaoerolebonus.py b/eos/effects/commandburstaoerolebonus.py
index aa7fe44ce..f69aecd01 100644
--- a/eos/effects/commandburstaoerolebonus.py
+++ b/eos/effects/commandburstaoerolebonus.py
@@ -2,7 +2,7 @@
 #
 # Used by:
 # Ships from group: Carrier (4 of 4)
-# Ships from group: Combat Battlecruiser (13 of 13)
+# Ships from group: Combat Battlecruiser (14 of 14)
 # Ships from group: Command Ship (8 of 8)
 # Ships from group: Force Auxiliary (6 of 6)
 # Ships from group: Supercarrier (6 of 6)
diff --git a/eos/effects/disintegratorweapondamagemultiply.py b/eos/effects/disintegratorweapondamagemultiply.py
index a96f6bc3f..b070c9ee2 100644
--- a/eos/effects/disintegratorweapondamagemultiply.py
+++ b/eos/effects/disintegratorweapondamagemultiply.py
@@ -1,7 +1,7 @@
 # disintegratorWeaponDamageMultiply
 #
 # Used by:
-# Modules from group: Entropic Radiation Sink (3 of 3)
+# Modules from group: Entropic Radiation Sink (4 of 4)
 type = "passive"
 
 
diff --git a/eos/effects/disintegratorweaponspeedmultiply.py b/eos/effects/disintegratorweaponspeedmultiply.py
index aa2a9998b..eccf38371 100644
--- a/eos/effects/disintegratorweaponspeedmultiply.py
+++ b/eos/effects/disintegratorweaponspeedmultiply.py
@@ -1,7 +1,7 @@
 # disintegratorWeaponSpeedMultiply
 #
 # Used by:
-# Modules from group: Entropic Radiation Sink (3 of 3)
+# Modules from group: Entropic Radiation Sink (4 of 4)
 type = "passive"
 
 
diff --git a/eos/effects/dronemaxvelocitybonus.py b/eos/effects/dronemaxvelocitybonus.py
index e3fc1ba6e..9ab5f4af0 100644
--- a/eos/effects/dronemaxvelocitybonus.py
+++ b/eos/effects/dronemaxvelocitybonus.py
@@ -2,6 +2,8 @@
 #
 # Used by:
 # Modules named like: Drone Speed Augmentor (6 of 8)
+# Implant: Overmind 'Goliath' Drone Tuner T25-10S
+# Implant: Overmind 'Hawkmoth' Drone Tuner S10-25T
 type = "passive"
 
 
diff --git a/eos/effects/elitebonuscovertops3pctdamagepercycle.py b/eos/effects/elitebonuscovertops3pctdamagepercycle.py
index 80083c966..550cdc94b 100644
--- a/eos/effects/elitebonuscovertops3pctdamagepercycle.py
+++ b/eos/effects/elitebonuscovertops3pctdamagepercycle.py
@@ -1,3 +1,7 @@
+# eliteBonusCovertOps3PCTdamagePerCycle
+#
+# Used by:
+# Ship: Hydra
 type = "passive"
 
 
diff --git a/eos/effects/elitebonusmaxdmgmultibonusadd.py b/eos/effects/elitebonusmaxdmgmultibonusadd.py
deleted file mode 100644
index 7e9a5cc29..000000000
--- a/eos/effects/elitebonusmaxdmgmultibonusadd.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusMaxDmgMultiBonusAdd
-#
-# Used by:
-# Ship: Hydra
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Small Precursor Weapon"), "damageMultiplierBonusMax",
-                                     src.getModifiedItemAttr("eliteBonusCovertOps3"), skill="Covert Ops")
diff --git a/eos/effects/elitebonusreconmaxdmgmultimaxhpt.py b/eos/effects/elitebonusreconmaxdmgmultimaxhpt.py
deleted file mode 100644
index 1350d5a93..000000000
--- a/eos/effects/elitebonusreconmaxdmgmultimaxhpt.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusReconMaxDmgMultiMaxHPT
-#
-# Used by:
-# Ship: Tiamat
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Medium Precursor Weapon"), "damageMultiplierBonusMax",
-                                     src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/elitebonusreconship3pctdamagepercycle.py b/eos/effects/elitebonusreconship3pctdamagepercycle.py
index 96fab9026..5aabfdcb7 100644
--- a/eos/effects/elitebonusreconship3pctdamagepercycle.py
+++ b/eos/effects/elitebonusreconship3pctdamagepercycle.py
@@ -1,3 +1,7 @@
+# eliteBonusReconShip3PCTdamagePerCycle
+#
+# Used by:
+# Ship: Tiamat
 type = "passive"
 
 
diff --git a/eos/effects/emergencyhullenergizer.py b/eos/effects/emergencyhullenergizer.py
index 122ef6e46..8a281f74c 100644
--- a/eos/effects/emergencyhullenergizer.py
+++ b/eos/effects/emergencyhullenergizer.py
@@ -1,3 +1,7 @@
+# emergencyHullEnergizer
+#
+# Used by:
+# Variations of module: Capital Emergency Hull Energizer I (5 of 5)
 type = "active"
 runtime = "late"
 
diff --git a/eos/effects/energyweapondamagemultiply.py b/eos/effects/energyweapondamagemultiply.py
index 0eb10ef75..42dddd186 100644
--- a/eos/effects/energyweapondamagemultiply.py
+++ b/eos/effects/energyweapondamagemultiply.py
@@ -1,7 +1,7 @@
 # energyWeaponDamageMultiply
 #
 # Used by:
-# Modules from group: Heat Sink (18 of 18)
+# Modules from group: Heat Sink (19 of 19)
 type = "passive"
 
 
diff --git a/eos/effects/energyweaponspeedmultiply.py b/eos/effects/energyweaponspeedmultiply.py
index 209787284..19dacfb85 100644
--- a/eos/effects/energyweaponspeedmultiply.py
+++ b/eos/effects/energyweaponspeedmultiply.py
@@ -1,7 +1,7 @@
 # energyWeaponSpeedMultiply
 #
 # Used by:
-# Modules from group: Heat Sink (18 of 18)
+# Modules from group: Heat Sink (19 of 19)
 type = "passive"
 
 
diff --git a/eos/effects/hybridweapondamagemultiply.py b/eos/effects/hybridweapondamagemultiply.py
index 0fe01369c..87166fc7c 100644
--- a/eos/effects/hybridweapondamagemultiply.py
+++ b/eos/effects/hybridweapondamagemultiply.py
@@ -1,7 +1,7 @@
 # hybridWeaponDamageMultiply
 #
 # Used by:
-# Modules from group: Magnetic Field Stabilizer (14 of 14)
+# Modules from group: Magnetic Field Stabilizer (15 of 15)
 type = "passive"
 
 
diff --git a/eos/effects/hybridweaponspeedmultiply.py b/eos/effects/hybridweaponspeedmultiply.py
index ac601b221..876ef5b3c 100644
--- a/eos/effects/hybridweaponspeedmultiply.py
+++ b/eos/effects/hybridweaponspeedmultiply.py
@@ -1,7 +1,7 @@
 # hybridWeaponSpeedMultiply
 #
 # Used by:
-# Modules from group: Magnetic Field Stabilizer (14 of 14)
+# Modules from group: Magnetic Field Stabilizer (15 of 15)
 type = "passive"
 
 
diff --git a/eos/effects/massentanglereffect5.py b/eos/effects/massentanglereffect5.py
index 8ec34a55d..ebeb25f5a 100644
--- a/eos/effects/massentanglereffect5.py
+++ b/eos/effects/massentanglereffect5.py
@@ -1,3 +1,7 @@
+# massEntanglerEffect5
+#
+# Used by:
+# Module: Zero-Point Mass Entangler
 type = "active"
 
 
diff --git a/eos/effects/mininglaser.py b/eos/effects/mininglaser.py
index 09bda59bf..1351132dd 100644
--- a/eos/effects/mininglaser.py
+++ b/eos/effects/mininglaser.py
@@ -4,6 +4,7 @@
 # Modules from group: Frequency Mining Laser (3 of 3)
 # Modules from group: Mining Laser (15 of 15)
 # Modules from group: Strip Miner (5 of 5)
+# Module: Citizen Miner
 type = 'active'
 
 
diff --git a/eos/effects/missiledmgbonus.py b/eos/effects/missiledmgbonus.py
index d565bdaaf..263ba9834 100644
--- a/eos/effects/missiledmgbonus.py
+++ b/eos/effects/missiledmgbonus.py
@@ -1,7 +1,7 @@
 # missileDMGBonus
 #
 # Used by:
-# Modules from group: Ballistic Control system (20 of 20)
+# Modules from group: Ballistic Control system (21 of 21)
 type = "passive"
 
 
diff --git a/eos/effects/missilelauncherspeedmultiplier.py b/eos/effects/missilelauncherspeedmultiplier.py
index cc339b5ab..68a2bd707 100644
--- a/eos/effects/missilelauncherspeedmultiplier.py
+++ b/eos/effects/missilelauncherspeedmultiplier.py
@@ -1,7 +1,7 @@
 # missileLauncherSpeedMultiplier
 #
 # Used by:
-# Modules from group: Ballistic Control system (20 of 20)
+# Modules from group: Ballistic Control system (21 of 21)
 type = "passive"
 
 
diff --git a/eos/effects/overloadselfdurationbonus.py b/eos/effects/overloadselfdurationbonus.py
index 90c275da8..fd4a5561c 100644
--- a/eos/effects/overloadselfdurationbonus.py
+++ b/eos/effects/overloadselfdurationbonus.py
@@ -7,6 +7,7 @@
 # Modules from group: Hull Repair Unit (25 of 25)
 # Modules from group: Remote Armor Repairer (39 of 39)
 # Modules from group: Remote Capacitor Transmitter (41 of 41)
+# Modules from group: Remote Hull Repairer (8 of 8)
 # Modules from group: Remote Shield Booster (38 of 38)
 # Modules from group: Smart Bomb (118 of 118)
 # Modules from group: Warp Disrupt Field Generator (7 of 7)
diff --git a/eos/effects/projectileweapondamagemultiply.py b/eos/effects/projectileweapondamagemultiply.py
index 711075efb..aeafffff7 100644
--- a/eos/effects/projectileweapondamagemultiply.py
+++ b/eos/effects/projectileweapondamagemultiply.py
@@ -1,7 +1,7 @@
 # projectileWeaponDamageMultiply
 #
 # Used by:
-# Modules from group: Gyrostabilizer (13 of 13)
+# Modules from group: Gyrostabilizer (14 of 14)
 type = "passive"
 
 
diff --git a/eos/effects/projectileweaponspeedmultiply.py b/eos/effects/projectileweaponspeedmultiply.py
index 784712da1..73c1d538d 100644
--- a/eos/effects/projectileweaponspeedmultiply.py
+++ b/eos/effects/projectileweaponspeedmultiply.py
@@ -1,7 +1,7 @@
 # projectileWeaponSpeedMultiply
 #
 # Used by:
-# Modules from group: Gyrostabilizer (13 of 13)
+# Modules from group: Gyrostabilizer (14 of 14)
 type = "passive"
 
 
diff --git a/eos/effects/rolebonuswarpspeed.py b/eos/effects/rolebonuswarpspeed.py
index 1b295565f..2532ab94a 100644
--- a/eos/effects/rolebonuswarpspeed.py
+++ b/eos/effects/rolebonuswarpspeed.py
@@ -1,3 +1,11 @@
+# roleBonusWarpSpeed
+#
+# Used by:
+# Ship: Cynabal
+# Ship: Dramiel
+# Ship: Leopard
+# Ship: Machariel
+# Ship: Victorieux Luxury Yacht
 type = "passive"
 
 
diff --git a/eos/effects/shiparmoremresistancepbc2.py b/eos/effects/shiparmoremresistancepbc2.py
index 9cf226dae..8fcf35f0e 100644
--- a/eos/effects/shiparmoremresistancepbc2.py
+++ b/eos/effects/shiparmoremresistancepbc2.py
@@ -1,3 +1,7 @@
+# shipArmorEMResistancePBC2
+#
+# Used by:
+# Ship: Drekavac
 type = "passive"
 
 
diff --git a/eos/effects/shiparmorexplosiveresistancepbc2.py b/eos/effects/shiparmorexplosiveresistancepbc2.py
index 4e5fc21b9..588feda67 100644
--- a/eos/effects/shiparmorexplosiveresistancepbc2.py
+++ b/eos/effects/shiparmorexplosiveresistancepbc2.py
@@ -1,3 +1,7 @@
+# shipArmorExplosiveResistancePBC2
+#
+# Used by:
+# Ship: Drekavac
 type = "passive"
 
 
diff --git a/eos/effects/shiparmorkineticresistancepbc2.py b/eos/effects/shiparmorkineticresistancepbc2.py
index 94208376c..0248e9374 100644
--- a/eos/effects/shiparmorkineticresistancepbc2.py
+++ b/eos/effects/shiparmorkineticresistancepbc2.py
@@ -1,3 +1,7 @@
+# shipArmorKineticResistancePBC2
+#
+# Used by:
+# Ship: Drekavac
 type = "passive"
 
 
diff --git a/eos/effects/shiparmorthermalresistancepbc2.py b/eos/effects/shiparmorthermalresistancepbc2.py
index e158932d8..99149f084 100644
--- a/eos/effects/shiparmorthermalresistancepbc2.py
+++ b/eos/effects/shiparmorthermalresistancepbc2.py
@@ -1,3 +1,7 @@
+# shipArmorThermalResistancePBC2
+#
+# Used by:
+# Ship: Drekavac
 type = "passive"
 
 
diff --git a/eos/effects/shipbonusdreadnoughtc2shieldresists.py b/eos/effects/shipbonusdreadnoughtc2shieldresists.py
index f89b07a23..6a533902c 100644
--- a/eos/effects/shipbonusdreadnoughtc2shieldresists.py
+++ b/eos/effects/shipbonusdreadnoughtc2shieldresists.py
@@ -1,8 +1,7 @@
 # shipBonusDreadnoughtC2ShieldResists
 #
 # Used by:
-# Ship: Caiman
-# Ship: Phoenix
+# Variations of ship: Phoenix (2 of 2)
 type = "passive"
 
 
diff --git a/eos/effects/shipbonusforceauxiliarya3capcapacity.py b/eos/effects/shipbonusforceauxiliarya3capcapacity.py
deleted file mode 100644
index 604573a39..000000000
--- a/eos/effects/shipbonusforceauxiliarya3capcapacity.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusForceAuxiliaryA3CapCapacity
-#
-# Used by:
-# Ship: Apostle
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("capacitorCapacity", src.getModifiedItemAttr("shipBonusForceAuxiliaryA3"),
-                           skill="Amarr Carrier")
diff --git a/eos/effects/shipbonusforceauxiliaryc2shieldresists.py b/eos/effects/shipbonusforceauxiliaryc2shieldresists.py
index bcdee6cdf..b18ae263a 100644
--- a/eos/effects/shipbonusforceauxiliaryc2shieldresists.py
+++ b/eos/effects/shipbonusforceauxiliaryc2shieldresists.py
@@ -1,8 +1,7 @@
 # shipBonusForceAuxiliaryC2ShieldResists
 #
 # Used by:
-# Ship: Loggerhead
-# Ship: Minokawa
+# Variations of ship: Minokawa (2 of 2)
 type = "passive"
 
 
diff --git a/eos/effects/shipbonusforceauxiliaryc3capcapacity.py b/eos/effects/shipbonusforceauxiliaryc3capcapacity.py
deleted file mode 100644
index e7ed1f5de..000000000
--- a/eos/effects/shipbonusforceauxiliaryc3capcapacity.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusForceAuxiliaryC3CapCapacity
-#
-# Used by:
-# Ship: Minokawa
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("capacitorCapacity", src.getModifiedItemAttr("shipBonusForceAuxiliaryC3"),
-                           skill="Caldari Carrier")
diff --git a/eos/effects/shipbonusforceauxiliaryg3capboosterstrength.py b/eos/effects/shipbonusforceauxiliaryg3capboosterstrength.py
deleted file mode 100644
index 7dbd8b392..000000000
--- a/eos/effects/shipbonusforceauxiliaryg3capboosterstrength.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusForceAuxiliaryG3CapBoosterStrength
-#
-# Used by:
-# Ship: Ninazu
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Capacitor Booster Charge", "capacitorBonus",
-                                    src.getModifiedItemAttr("shipBonusForceAuxiliaryG3"), skill="Gallente Carrier")
diff --git a/eos/effects/shipbonusforceauxiliarym3capboosterstrength.py b/eos/effects/shipbonusforceauxiliarym3capboosterstrength.py
deleted file mode 100644
index a2a656cea..000000000
--- a/eos/effects/shipbonusforceauxiliarym3capboosterstrength.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusForceAuxiliaryM3CapBoosterStrength
-#
-# Used by:
-# Ship: Lif
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Capacitor Booster Charge", "capacitorBonus",
-                                    src.getModifiedItemAttr("shipBonusForceAuxiliaryM3"), skill="Minmatar Carrier")
diff --git a/eos/effects/shipbonusneutcapneedrolebonus2.py b/eos/effects/shipbonusneutcapneedrolebonus2.py
index b48e784ad..52dfa7796 100644
--- a/eos/effects/shipbonusneutcapneedrolebonus2.py
+++ b/eos/effects/shipbonusneutcapneedrolebonus2.py
@@ -2,7 +2,9 @@
 #
 # Used by:
 # Ship: Damavik
+# Ship: Drekavac
 # Ship: Hydra
+# Ship: Kikimora
 # Ship: Leshak
 # Ship: Tiamat
 # Ship: Vedmak
diff --git a/eos/effects/shipbonuspbc1disintegratordamage.py b/eos/effects/shipbonuspbc1disintegratordamage.py
index 21251180b..da8e257ea 100644
--- a/eos/effects/shipbonuspbc1disintegratordamage.py
+++ b/eos/effects/shipbonuspbc1disintegratordamage.py
@@ -1,3 +1,7 @@
+# shipBonusPBC1DisintegratorDamage
+#
+# Used by:
+# Ship: Drekavac
 type = "passive"
 
 
diff --git a/eos/effects/shipbonuspd1disintegratordamage.py b/eos/effects/shipbonuspd1disintegratordamage.py
index 23ed2dc5b..23adcba2d 100644
--- a/eos/effects/shipbonuspd1disintegratordamage.py
+++ b/eos/effects/shipbonuspd1disintegratordamage.py
@@ -1,3 +1,7 @@
+# shipBonusPD1DisintegratorDamage
+#
+# Used by:
+# Ship: Kikimora
 type = "passive"
 
 
diff --git a/eos/effects/shipbonuspd2disintegratormaxrange.py b/eos/effects/shipbonuspd2disintegratormaxrange.py
index 740734435..c56940a22 100644
--- a/eos/effects/shipbonuspd2disintegratormaxrange.py
+++ b/eos/effects/shipbonuspd2disintegratormaxrange.py
@@ -1,3 +1,7 @@
+# shipBonusPD2DisintegratorMaxRange
+#
+# Used by:
+# Ship: Kikimora
 type = "passive"
 
 
diff --git a/eos/effects/shipbonusremoterepcapneedrolebonus2.py b/eos/effects/shipbonusremoterepcapneedrolebonus2.py
index 64df7fa9e..ac4ef0aa0 100644
--- a/eos/effects/shipbonusremoterepcapneedrolebonus2.py
+++ b/eos/effects/shipbonusremoterepcapneedrolebonus2.py
@@ -2,7 +2,9 @@
 #
 # Used by:
 # Ship: Damavik
+# Ship: Drekavac
 # Ship: Hydra
+# Ship: Kikimora
 # Ship: Leshak
 # Ship: Tiamat
 # Ship: Vedmak
diff --git a/eos/effects/shipbonusremoterepmaxrangerolebonus1.py b/eos/effects/shipbonusremoterepmaxrangerolebonus1.py
index fc2fc3b14..31963a4da 100644
--- a/eos/effects/shipbonusremoterepmaxrangerolebonus1.py
+++ b/eos/effects/shipbonusremoterepmaxrangerolebonus1.py
@@ -2,7 +2,9 @@
 #
 # Used by:
 # Ship: Damavik
+# Ship: Drekavac
 # Ship: Hydra
+# Ship: Kikimora
 # Ship: Leshak
 # Ship: Tiamat
 # Ship: Vedmak
diff --git a/eos/effects/shipbonusrole3xltorpdeovelocitybonus.py b/eos/effects/shipbonusrole3xltorpdeovelocitybonus.py
index 0c383ef58..02023dc88 100644
--- a/eos/effects/shipbonusrole3xltorpdeovelocitybonus.py
+++ b/eos/effects/shipbonusrole3xltorpdeovelocitybonus.py
@@ -1,8 +1,7 @@
 # shipBonusRole3XLTorpdeoVelocityBonus
 #
 # Used by:
-# Ship: Komodo
-# Ship: Leviathan
+# Variations of ship: Leviathan (2 of 2)
 type = "passive"
 
 
diff --git a/eos/effects/shipbonussmartbombcapneedrolebonus2.py b/eos/effects/shipbonussmartbombcapneedrolebonus2.py
index 07eb85b54..62bd5dcba 100644
--- a/eos/effects/shipbonussmartbombcapneedrolebonus2.py
+++ b/eos/effects/shipbonussmartbombcapneedrolebonus2.py
@@ -2,7 +2,9 @@
 #
 # Used by:
 # Ship: Damavik
+# Ship: Drekavac
 # Ship: Hydra
+# Ship: Kikimora
 # Ship: Leshak
 # Ship: Tiamat
 # Ship: Vedmak
diff --git a/eos/effects/shipbonustitana3warpstrength.py b/eos/effects/shipbonustitana3warpstrength.py
index e5fee5ffc..f89d421c4 100644
--- a/eos/effects/shipbonustitana3warpstrength.py
+++ b/eos/effects/shipbonustitana3warpstrength.py
@@ -1,8 +1,7 @@
 # shipBonusTitanA3WarpStrength
 #
 # Used by:
-# Ship: Avatar
-# Ship: Molok
+# Variations of ship: Avatar (2 of 2)
 type = "passive"
 
 
diff --git a/eos/effects/shipbonustitanc2rofbonus.py b/eos/effects/shipbonustitanc2rofbonus.py
index 78d592e85..52ce60bda 100644
--- a/eos/effects/shipbonustitanc2rofbonus.py
+++ b/eos/effects/shipbonustitanc2rofbonus.py
@@ -1,8 +1,7 @@
 # shipBonusTitanC2ROFBonus
 #
 # Used by:
-# Ship: Komodo
-# Ship: Leviathan
+# Variations of ship: Leviathan (2 of 2)
 type = "passive"
 
 
diff --git a/eos/effects/shipbonustitanc3warpstrength.py b/eos/effects/shipbonustitanc3warpstrength.py
index 67186a13b..2932f5fc1 100644
--- a/eos/effects/shipbonustitanc3warpstrength.py
+++ b/eos/effects/shipbonustitanc3warpstrength.py
@@ -1,8 +1,7 @@
 # shipBonusTitanC3WarpStrength
 #
 # Used by:
-# Ship: Komodo
-# Ship: Leviathan
+# Variations of ship: Leviathan (2 of 2)
 type = "passive"
 
 
diff --git a/eos/effects/shiproledisintegratormaxrangecbc.py b/eos/effects/shiproledisintegratormaxrangecbc.py
index c89d0d8c2..193bcd298 100644
--- a/eos/effects/shiproledisintegratormaxrangecbc.py
+++ b/eos/effects/shiproledisintegratormaxrangecbc.py
@@ -1,3 +1,7 @@
+# shipRoleDisintegratorMaxRangeCBC
+#
+# Used by:
+# Ship: Drekavac
 type = "passive"
 
 
diff --git a/eos/effects/skillbonusdronedurability.py b/eos/effects/skillbonusdronedurability.py
index 97b3c34bf..e68cb4254 100644
--- a/eos/effects/skillbonusdronedurability.py
+++ b/eos/effects/skillbonusdronedurability.py
@@ -1,7 +1,7 @@
 # skillBonusDroneDurability
 #
 # Used by:
-# Implants from group: Cyber Drones (2 of 2)
+# Implants from group: Cyber Drones (4 of 4)
 # Skill: Drone Durability
 type = "passive"
 
diff --git a/eos/effects/skillbonusdroneinterfacing.py b/eos/effects/skillbonusdroneinterfacing.py
index 0fbac4beb..93093efc3 100644
--- a/eos/effects/skillbonusdroneinterfacing.py
+++ b/eos/effects/skillbonusdroneinterfacing.py
@@ -1,7 +1,8 @@
 # skillBonusDroneInterfacing
 #
 # Used by:
-# Implants from group: Cyber Drones (2 of 2)
+# Implant: CreoDron 'Bumblebee' Drone Tuner T10-5D
+# Implant: CreoDron 'Yellowjacket' Drone Tuner D5-10T
 # Skill: Drone Interfacing
 type = "passive"
 
diff --git a/eos/effects/smalldisintegratormaxrangebonus.py b/eos/effects/smalldisintegratormaxrangebonus.py
index 232bf0c2f..74e4dca9d 100644
--- a/eos/effects/smalldisintegratormaxrangebonus.py
+++ b/eos/effects/smalldisintegratormaxrangebonus.py
@@ -1,3 +1,7 @@
+# smallDisintegratorMaxRangeBonus
+#
+# Used by:
+# Ship: Kikimora
 type = "passive"
 
 
diff --git a/eos/effects/structureaoerofrolebonus.py b/eos/effects/structureaoerofrolebonus.py
index 776f9a2e9..48dc00c7d 100644
--- a/eos/effects/structureaoerofrolebonus.py
+++ b/eos/effects/structureaoerofrolebonus.py
@@ -1,7 +1,8 @@
 # structureAoERoFRoleBonus
 #
 # Used by:
-# Items from category: Structure (11 of 14)
+# Items from category: Structure (11 of 17)
+# Structures from group: Citadel (8 of 9)
 type = "passive"
 
 
diff --git a/eos/effects/structurefullpowerstatehitpointmodifier.py b/eos/effects/structurefullpowerstatehitpointmodifier.py
index fd60335f7..5ae185d64 100644
--- a/eos/effects/structurefullpowerstatehitpointmodifier.py
+++ b/eos/effects/structurefullpowerstatehitpointmodifier.py
@@ -1,7 +1,7 @@
 # structureFullPowerStateHitpointModifier
 #
 # Used by:
-# Items from category: Structure (14 of 14)
+# Items from category: Structure (17 of 17)
 type = "passive"
 
 
diff --git a/eos/effects/structurehiddenarmorhpmultiplier.py b/eos/effects/structurehiddenarmorhpmultiplier.py
index 045253880..af1b39be3 100644
--- a/eos/effects/structurehiddenarmorhpmultiplier.py
+++ b/eos/effects/structurehiddenarmorhpmultiplier.py
@@ -1,7 +1,7 @@
 # structureHiddenArmorHPMultiplier
 #
 # Used by:
-# Items from category: Structure (14 of 14)
+# Items from category: Structure (17 of 17)
 type = "passive"
 
 
diff --git a/eos/effects/structurehiddenmissiledamagemultiplier.py b/eos/effects/structurehiddenmissiledamagemultiplier.py
index bf77075ad..61abbf2f4 100644
--- a/eos/effects/structurehiddenmissiledamagemultiplier.py
+++ b/eos/effects/structurehiddenmissiledamagemultiplier.py
@@ -1,7 +1,7 @@
 # structureHiddenMissileDamageMultiplier
 #
 # Used by:
-# Items from category: Structure (14 of 14)
+# Items from category: Structure (14 of 17)
 type = "passive"
 
 
diff --git a/eos/effects/targetattack.py b/eos/effects/targetattack.py
index 4f0625c89..c0057acc5 100644
--- a/eos/effects/targetattack.py
+++ b/eos/effects/targetattack.py
@@ -1,7 +1,7 @@
 # targetAttack
 #
 # Used by:
-# Drones from group: Combat Drone (74 of 74)
+# Drones from group: Combat Drone (75 of 75)
 # Modules from group: Energy Weapon (212 of 214)
 type = 'active'
 
diff --git a/eos/effects/warpdisrupt.py b/eos/effects/warpdisrupt.py
index 476608626..38b53c1fc 100644
--- a/eos/effects/warpdisrupt.py
+++ b/eos/effects/warpdisrupt.py
@@ -1,4 +1,4 @@
-# warpScramble
+# warpDisrupt
 #
 # Used by:
 # Modules named like: Warp Disruptor (28 of 28)