diff --git a/eos/effects/ammoinfluencecapneed.py b/eos/effects/ammoinfluencecapneed.py
index c9c0392f40..6b7b958dc8 100644
--- a/eos/effects/ammoinfluencecapneed.py
+++ b/eos/effects/ammoinfluencecapneed.py
@@ -1,7 +1,7 @@
 # ammoInfluenceCapNeed
 #
 # Used by:
-# Items from category: Charge (458 of 831)
+# Items from category: Charge (458 of 833)
 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 ba42613deb..f40b9e94c4 100644
--- a/eos/effects/ammoinfluencerange.py
+++ b/eos/effects/ammoinfluencerange.py
@@ -1,7 +1,7 @@
 # ammoInfluenceRange
 #
 # Used by:
-# Items from category: Charge (559 of 831)
+# Items from category: Charge (559 of 833)
 type = "passive"
 def handler(fit, module, context):
     module.multiplyItemAttr("maxRange", module.getModifiedChargeAttr("weaponRangeMultiplier"))
\ No newline at end of file
diff --git a/eos/effects/armorrepairprojectorfalloffbonus.py b/eos/effects/armorrepairprojectorfalloffbonus.py
index 405f9802a6..fc9ab14f30 100644
--- a/eos/effects/armorrepairprojectorfalloffbonus.py
+++ b/eos/effects/armorrepairprojectorfalloffbonus.py
@@ -1,3 +1,11 @@
+# armorRepairProjectorFalloffBonus
+#
+# Used by:
+# Variations of ship: Navitas (2 of 2)
+# Ship: Augoror
+# Ship: Deacon
+# Ship: Exequror
+# Ship: Inquisitor
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", "falloffEffectiveness", src.getModifiedItemAttr("falloffBonus"))
diff --git a/eos/effects/armorrepairprojectormaxrangebonus.py b/eos/effects/armorrepairprojectormaxrangebonus.py
index 036b98484d..e972a1afd7 100644
--- a/eos/effects/armorrepairprojectormaxrangebonus.py
+++ b/eos/effects/armorrepairprojectormaxrangebonus.py
@@ -1,10 +1,11 @@
 # armorRepairProjectorMaxRangeBonus
 #
 # Used by:
+# Variations of ship: Navitas (2 of 2)
 # Ship: Augoror
+# Ship: Deacon
 # Ship: Exequror
 # Ship: Inquisitor
-# Ship: Navitas
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer",
diff --git a/eos/effects/caldarishipewcapacitorneedcf2.py b/eos/effects/caldarishipewcapacitorneedcf2.py
index 58c2e34a04..4f90135ab1 100644
--- a/eos/effects/caldarishipewcapacitorneedcf2.py
+++ b/eos/effects/caldarishipewcapacitorneedcf2.py
@@ -1,7 +1,8 @@
 # caldariShipEwCapacitorNeedCF2
 #
 # Used by:
-# Variations of ship: Griffin (2 of 2)
+# Ship: Griffin
+# Ship: Kitsune
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
diff --git a/eos/effects/capacitorcapacitymultiply.py b/eos/effects/capacitorcapacitymultiply.py
index b60cb07a5c..03c560d55b 100644
--- a/eos/effects/capacitorcapacitymultiply.py
+++ b/eos/effects/capacitorcapacitymultiply.py
@@ -6,8 +6,6 @@
 # Modules from group: Power Diagnostic System (23 of 23)
 # Modules from group: Propulsion Module (114 of 114)
 # Modules from group: Reactor Control Unit (22 of 22)
-# Modules from group: Shield Flux Coil (11 of 11)
-# Modules from group: Shield Power Relay (11 of 11)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("capacitorCapacity", module.getModifiedItemAttr("capacitorCapacityMultiplier"))
diff --git a/eos/effects/carrieramarrarmortransferfalloff3.py b/eos/effects/carrieramarrarmortransferfalloff3.py
index 5eb8e46c30..577fc749bb 100644
--- a/eos/effects/carrieramarrarmortransferfalloff3.py
+++ b/eos/effects/carrieramarrarmortransferfalloff3.py
@@ -1,3 +1,8 @@
+# carrierAmarrArmorTransferFalloff3
+#
+# Used by:
+# Ship: Aeon
+# Ship: Archon
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"), "falloffEffectiveness", src.getModifiedItemAttr("carrierAmarrBonus3"), skill="Amarr Carrier")
diff --git a/eos/effects/carriercaldarishieldtransferfalloff3.py b/eos/effects/carriercaldarishieldtransferfalloff3.py
index db9443da5d..301407707a 100644
--- a/eos/effects/carriercaldarishieldtransferfalloff3.py
+++ b/eos/effects/carriercaldarishieldtransferfalloff3.py
@@ -1,3 +1,9 @@
+# carrierCaldariShieldTransferFalloff3
+#
+# Used by:
+# Ship: Chimera
+# Ship: Revenant
+# Ship: Wyvern
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"), "falloffEffectiveness", src.getModifiedItemAttr("carrierCaldariBonus3"), skill="Caldari Carrier")
diff --git a/eos/effects/carriergallentearmorshieldtransferfalloff3.py b/eos/effects/carriergallentearmorshieldtransferfalloff3.py
index 371a664cff..2f3a5fd55f 100644
--- a/eos/effects/carriergallentearmorshieldtransferfalloff3.py
+++ b/eos/effects/carriergallentearmorshieldtransferfalloff3.py
@@ -1,3 +1,8 @@
+# carrierGallenteArmor&ShieldTransferFalloff3
+#
+# Used by:
+# Ship: Nyx
+# Ship: Thanatos
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems") or mod.item.requiresSkill("Capital Remote Armor Repair Systems"), "falloffEffectiveness", src.getModifiedItemAttr("carrierGallenteBonus3"), skill="Gallente Carrier")
\ No newline at end of file
diff --git a/eos/effects/carrierminmatararmorshieldtransferfalloff3.py b/eos/effects/carrierminmatararmorshieldtransferfalloff3.py
index a37581c56c..27eb623c12 100644
--- a/eos/effects/carrierminmatararmorshieldtransferfalloff3.py
+++ b/eos/effects/carrierminmatararmorshieldtransferfalloff3.py
@@ -1,3 +1,8 @@
+# carrierMinmatarArmor&ShieldTransferFalloff3
+#
+# Used by:
+# Ship: Hel
+# Ship: Nidhoggur
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems") or mod.item.requiresSkill("Capital Remote Armor Repair Systems"), "falloffEffectiveness", src.getModifiedItemAttr("carrierMinmatarBonus3"), skill="Minmatar Carrier")
diff --git a/eos/effects/covertopsandreconopscloakmoduledelaybonus.py b/eos/effects/covertopsandreconopscloakmoduledelaybonus.py
index 788ff7c3e4..9b293787d1 100644
--- a/eos/effects/covertopsandreconopscloakmoduledelaybonus.py
+++ b/eos/effects/covertopsandreconopscloakmoduledelaybonus.py
@@ -4,12 +4,12 @@
 # Ships from group: Black Ops (4 of 4)
 # Ships from group: Blockade Runner (4 of 4)
 # Ships from group: Covert Ops (5 of 5)
+# Ships from group: Expedition Frigate (2 of 2)
 # Ships from group: Force Recon Ship (6 of 6)
 # Ships from group: Stealth Bomber (4 of 4)
 # Ships named like: Stratios (2 of 2)
 # Subsystems named like: Offensive Covert Reconfiguration (4 of 4)
 # Ship: Astero
-# Ship: Prospect
 type = "passive"
 def handler(fit, container, context):
     fit.modules.filteredItemForce(lambda mod: mod.item.requiresSkill("Cloaking"),
diff --git a/eos/effects/covertopsstealthbombertargettingdelaybonus.py b/eos/effects/covertopsstealthbombertargettingdelaybonus.py
index 70f0c92641..04e246ac1e 100644
--- a/eos/effects/covertopsstealthbombertargettingdelaybonus.py
+++ b/eos/effects/covertopsstealthbombertargettingdelaybonus.py
@@ -4,6 +4,7 @@
 # Ships from group: Black Ops (4 of 4)
 # Ships from group: Stealth Bomber (4 of 4)
 # Ship: Chremoas
+# Ship: Endurance
 # Ship: Etana
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/dronearmordamagebonuseffect.py b/eos/effects/dronearmordamagebonuseffect.py
index 25ddfaf0cd..4abe3984ca 100644
--- a/eos/effects/dronearmordamagebonuseffect.py
+++ b/eos/effects/dronearmordamagebonuseffect.py
@@ -1,9 +1,8 @@
 # droneArmorDamageBonusEffect
 #
 # Used by:
+# Ships from group: Logistics (5 of 5)
 # Ship: Exequror
-# Ship: Guardian
-# Ship: Oneiros
 # Ship: Scythe
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/dronehullrepairbonuseffect.py b/eos/effects/dronehullrepairbonuseffect.py
index 2cb661aa46..b13fa45005 100644
--- a/eos/effects/dronehullrepairbonuseffect.py
+++ b/eos/effects/dronehullrepairbonuseffect.py
@@ -1,3 +1,9 @@
+# droneHullRepairBonusEffect
+#
+# Used by:
+# Ships from group: Logistics (5 of 5)
+# Ship: Exequror
+# Ship: Scythe
 type = "passive"
 def handler(fit, src, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Logistic Drone", "structureDamageAmount", src.getModifiedItemAttr("droneArmorDamageAmountBonus"))
\ No newline at end of file
diff --git a/eos/effects/droneshieldbonusbonuseffect.py b/eos/effects/droneshieldbonusbonuseffect.py
index ef22ac4899..7d6f083d4c 100644
--- a/eos/effects/droneshieldbonusbonuseffect.py
+++ b/eos/effects/droneshieldbonusbonuseffect.py
@@ -1,7 +1,7 @@
 # droneShieldBonusBonusEffect
 #
 # Used by:
-# Ships from group: Logistics (3 of 5)
+# Ships from group: Logistics (5 of 5)
 # Ship: Exequror
 # Ship: Scythe
 type = "passive"
diff --git a/eos/effects/elitebonuscommanddestroyerarmored1.py b/eos/effects/elitebonuscommanddestroyerarmored1.py
index 04cd1f32d1..63a0674c5f 100644
--- a/eos/effects/elitebonuscommanddestroyerarmored1.py
+++ b/eos/effects/elitebonuscommanddestroyerarmored1.py
@@ -1,3 +1,8 @@
+# eliteBonusCommandDestroyerArmored1
+#
+# Used by:
+# Ship: Magus
+# Ship: Pontifex
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
diff --git a/eos/effects/elitebonuscommanddestroyerinfo1.py b/eos/effects/elitebonuscommanddestroyerinfo1.py
index 6ed3a7a9ec..097d722719 100644
--- a/eos/effects/elitebonuscommanddestroyerinfo1.py
+++ b/eos/effects/elitebonuscommanddestroyerinfo1.py
@@ -1,3 +1,8 @@
+# eliteBonusCommandDestroyerInfo1
+#
+# Used by:
+# Ship: Pontifex
+# Ship: Stork
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
diff --git a/eos/effects/elitebonuscommanddestroyerinfohidden1.py b/eos/effects/elitebonuscommanddestroyerinfohidden1.py
index 9ebc8481c6..4704e5b86b 100644
--- a/eos/effects/elitebonuscommanddestroyerinfohidden1.py
+++ b/eos/effects/elitebonuscommanddestroyerinfohidden1.py
@@ -1,3 +1,8 @@
+# eliteBonusCommandDestroyerInfoHidden1
+#
+# Used by:
+# Ship: Pontifex
+# Ship: Stork
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonusHidden", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
diff --git a/eos/effects/elitebonuscommanddestroyermjfgspool2.py b/eos/effects/elitebonuscommanddestroyermjfgspool2.py
index 29b82ae425..6d6fdb6a89 100644
--- a/eos/effects/elitebonuscommanddestroyermjfgspool2.py
+++ b/eos/effects/elitebonuscommanddestroyermjfgspool2.py
@@ -1,3 +1,7 @@
+# eliteBonusCommandDestroyerMJFGspool2
+#
+# Used by:
+# Ships from group: Command Destroyers (4 of 4)
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Micro Jump Drive Operation"), "duration", src.getModifiedItemAttr("eliteBonusCommandDestroyer2"), skill="Command Destroyers")
diff --git a/eos/effects/elitebonuscommanddestroyermwdsigradius3.py b/eos/effects/elitebonuscommanddestroyermwdsigradius3.py
index 4b9926f91c..34abe1494e 100644
--- a/eos/effects/elitebonuscommanddestroyermwdsigradius3.py
+++ b/eos/effects/elitebonuscommanddestroyermwdsigradius3.py
@@ -1,3 +1,7 @@
+# eliteBonusCommandDestroyerMWDSigRadius3
+#
+# Used by:
+# Ships from group: Command Destroyers (4 of 4)
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"), "signatureRadiusBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer3"), skill="Command Destroyers")
diff --git a/eos/effects/elitebonuscommanddestroyersiege1.py b/eos/effects/elitebonuscommanddestroyersiege1.py
index 8b24b7e810..87bb356610 100644
--- a/eos/effects/elitebonuscommanddestroyersiege1.py
+++ b/eos/effects/elitebonuscommanddestroyersiege1.py
@@ -1,3 +1,8 @@
+# eliteBonusCommandDestroyerSiege1
+#
+# Used by:
+# Ship: Bifrost
+# Ship: Stork
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
diff --git a/eos/effects/elitebonuscommanddestroyerskirmish1.py b/eos/effects/elitebonuscommanddestroyerskirmish1.py
index d7e1c07dd7..cd30425e6c 100644
--- a/eos/effects/elitebonuscommanddestroyerskirmish1.py
+++ b/eos/effects/elitebonuscommanddestroyerskirmish1.py
@@ -1,3 +1,8 @@
+# eliteBonusCommandDestroyerSkirmish1
+#
+# Used by:
+# Ship: Bifrost
+# Ship: Magus
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
diff --git a/eos/effects/elitebonuselectronicattackshipenergyneutrange1.py b/eos/effects/elitebonuselectronicattackshipenergyneutrange1.py
deleted file mode 100644
index 867982c0bb..0000000000
--- a/eos/effects/elitebonuselectronicattackshipenergyneutrange1.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# eliteBonusElectronicAttackShipEnergyNeutRange1
-#
-# Used by:
-# Ship: Sentinel
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyDestabilizationRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1"), skill="Electronic Attack Ships")
diff --git a/eos/effects/elitebonuselectronicattackshipenergyvampirerange1.py b/eos/effects/elitebonuselectronicattackshipenergyvampirerange1.py
deleted file mode 100644
index 7974ce9cab..0000000000
--- a/eos/effects/elitebonuselectronicattackshipenergyvampirerange1.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# eliteBonusElectronicAttackShipEnergyVampireRange1
-#
-# Used by:
-# Ship: Sentinel
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "powerTransferRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1"), skill="Electronic Attack Ships")
diff --git a/eos/effects/elitebonuslogifrigarmorhp2.py b/eos/effects/elitebonuslogifrigarmorhp2.py
index 687b4feeee..ec7b571216 100644
--- a/eos/effects/elitebonuslogifrigarmorhp2.py
+++ b/eos/effects/elitebonuslogifrigarmorhp2.py
@@ -1,3 +1,7 @@
+# eliteBonusLogiFrigArmorHP2
+#
+# Used by:
+# Ship: Deacon
 type = "passive"
 def handler(fit, src, context):
     fit.ship.boostItemAttr("armorHP", src.getModifiedItemAttr("eliteBonusLogiFrig2"), skill="Logistics Frigates")
diff --git a/eos/effects/elitebonuslogifrigarmorrepspeedcap1.py b/eos/effects/elitebonuslogifrigarmorrepspeedcap1.py
index 8347b1b6f6..b3511a4136 100644
--- a/eos/effects/elitebonuslogifrigarmorrepspeedcap1.py
+++ b/eos/effects/elitebonuslogifrigarmorrepspeedcap1.py
@@ -1,3 +1,8 @@
+# eliteBonusLogiFrigArmorRepSpeedCap1
+#
+# Used by:
+# Ship: Deacon
+# Ship: Thalia
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed", src.getModifiedItemAttr("eliteBonusLogiFrig1"), skill="Logistics Frigates")
diff --git a/eos/effects/elitebonuslogifrigshieldhp2.py b/eos/effects/elitebonuslogifrigshieldhp2.py
index 932285db49..860a8041fc 100644
--- a/eos/effects/elitebonuslogifrigshieldhp2.py
+++ b/eos/effects/elitebonuslogifrigshieldhp2.py
@@ -1,3 +1,7 @@
+# eliteBonusLogiFrigShieldHP2
+#
+# Used by:
+# Ship: Kirin
 type = "passive"
 def handler(fit, src, context):
     fit.ship.boostItemAttr("shieldCapacity", src.getModifiedItemAttr("eliteBonusLogiFrig2"), skill="Logistics Frigates")
diff --git a/eos/effects/elitebonuslogifrigshieldrepspeedcap1.py b/eos/effects/elitebonuslogifrigshieldrepspeedcap1.py
index 492324ce89..15ccd7096c 100644
--- a/eos/effects/elitebonuslogifrigshieldrepspeedcap1.py
+++ b/eos/effects/elitebonuslogifrigshieldrepspeedcap1.py
@@ -1,3 +1,8 @@
+# eliteBonusLogiFrigShieldRepSpeedCap1
+#
+# Used by:
+# Ship: Kirin
+# Ship: Scalpel
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "duration", src.getModifiedItemAttr("eliteBonusLogiFrig1"), skill="Logistics Frigates")
diff --git a/eos/effects/elitebonuslogifrigsignature2.py b/eos/effects/elitebonuslogifrigsignature2.py
index a72670464a..9afe9b1f05 100644
--- a/eos/effects/elitebonuslogifrigsignature2.py
+++ b/eos/effects/elitebonuslogifrigsignature2.py
@@ -1,3 +1,8 @@
+# eliteBonusLogiFrigSignature2
+#
+# Used by:
+# Ship: Scalpel
+# Ship: Thalia
 type = "passive"
 def handler(fit, src, context):
     fit.ship.boostItemAttr("signatureRadius", src.getModifiedItemAttr("eliteBonusLogiFrig2"), skill="Logistics Frigates")
diff --git a/eos/effects/elitereconbonusenergyneutrange1.py b/eos/effects/elitereconbonusenergyneutrange1.py
deleted file mode 100644
index 12f4b54f2b..0000000000
--- a/eos/effects/elitereconbonusenergyneutrange1.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# eliteReconBonusEnergyNeutRange1
-#
-# Used by:
-# Ship: Curse
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyDestabilizationRange", ship.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
diff --git a/eos/effects/elitereconbonusneutrange3.py b/eos/effects/elitereconbonusneutrange3.py
deleted file mode 100644
index e203118c8d..0000000000
--- a/eos/effects/elitereconbonusneutrange3.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# eliteReconBonusNeutRange3
-#
-# Used by:
-# Ship: Pilgrim
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyDestabilizationRange", ship.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/elitereconbonusvamprange3.py b/eos/effects/elitereconbonusvamprange3.py
deleted file mode 100644
index 9b944f1506..0000000000
--- a/eos/effects/elitereconbonusvamprange3.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# eliteReconBonusVampRange3
-#
-# Used by:
-# Ship: Pilgrim
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "powerTransferRange", ship.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/elitereconenergyvampirerangebonus1.py b/eos/effects/elitereconenergyvampirerangebonus1.py
deleted file mode 100644
index 387740b250..0000000000
--- a/eos/effects/elitereconenergyvampirerangebonus1.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# eliteReconEnergyVampireRangeBonus1
-#
-# Used by:
-# Ship: Curse
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "powerTransferRange", ship.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
diff --git a/eos/effects/energydestabilizationnew.py b/eos/effects/energydestabilizationnew.py
index cd22ff6d16..eebab03a04 100644
--- a/eos/effects/energydestabilizationnew.py
+++ b/eos/effects/energydestabilizationnew.py
@@ -2,7 +2,6 @@
 #
 # Used by:
 # Drones from group: Cap Drain Drone (3 of 3)
-# Modules from group: Energy Destabilizer (41 of 41)
 from eos.types import State
 type = "active", "projected"
 def handler(fit, container, context):
diff --git a/eos/effects/energyneutralizerfalloff.py b/eos/effects/energyneutralizerfalloff.py
index 9346d4d85e..09d32a941c 100644
--- a/eos/effects/energyneutralizerfalloff.py
+++ b/eos/effects/energyneutralizerfalloff.py
@@ -1,3 +1,7 @@
+# energyNeutralizerFalloff
+#
+# Used by:
+# Modules from group: Energy Neutralizer (45 of 45)
 from eos.types import State
 type = "active", "projected"
 def handler(fit, container, context):
diff --git a/eos/effects/energynosferatufalloff.py b/eos/effects/energynosferatufalloff.py
index 59b2bffa98..f9348baa43 100644
--- a/eos/effects/energynosferatufalloff.py
+++ b/eos/effects/energynosferatufalloff.py
@@ -1,3 +1,7 @@
+# energyNosferatuFalloff
+#
+# Used by:
+# Modules from group: Energy Nosferatu (45 of 45)
 type = "active", "projected"
 runTime = "late"
 def handler(fit, module, context):
diff --git a/eos/effects/entosiscpuaddition.py b/eos/effects/entosiscpuaddition.py
index 03f0405ae9..335566d591 100644
--- a/eos/effects/entosiscpuaddition.py
+++ b/eos/effects/entosiscpuaddition.py
@@ -1,7 +1,7 @@
 # entosisCPUAddition
 #
 # Used by:
-# Modules from group: Entosis Link (2 of 2)
+# Modules from group: Entosis Link (6 of 6)
 type = "passive"
 def handler(fit, module, context):
     module.increaseItemAttr("cpu", module.getModifiedItemAttr("entosisCPUAdd"))
diff --git a/eos/effects/entosislink.py b/eos/effects/entosislink.py
index 2b63f6e125..c44f426bcf 100644
--- a/eos/effects/entosislink.py
+++ b/eos/effects/entosislink.py
@@ -1,7 +1,7 @@
 # entosisLink
 #
 # Used by:
-# Modules from group: Entosis Link (2 of 2)
+# Modules from group: Entosis Link (6 of 6)
 type = "active"
 def handler(fit, module, context):
     fit.ship.forceItemAttr("disallowAssistance", module.getModifiedItemAttr("disallowAssistance"))
diff --git a/eos/effects/ewskillguidancedisruptionbonus.py b/eos/effects/ewskillguidancedisruptionbonus.py
index 994070ac05..7348e304b5 100644
--- a/eos/effects/ewskillguidancedisruptionbonus.py
+++ b/eos/effects/ewskillguidancedisruptionbonus.py
@@ -1,3 +1,8 @@
+# ewSkillGuidanceDisruptionBonus
+#
+# Used by:
+# Modules named like: Tracking Diagnostic Subroutines (8 of 8)
+# Skill: Weapon Destabilization
 type = "passive"
 def handler(fit, src, context):
     level = src.level if "skill" in context else 1
diff --git a/eos/effects/ewskilltrackingdisruptionrangedisruptionbonus.py b/eos/effects/ewskilltrackingdisruptionrangedisruptionbonus.py
index 4d75b5cb14..461702874c 100644
--- a/eos/effects/ewskilltrackingdisruptionrangedisruptionbonus.py
+++ b/eos/effects/ewskilltrackingdisruptionrangedisruptionbonus.py
@@ -2,7 +2,7 @@
 #
 # Used by:
 # Modules named like: Tracking Diagnostic Subroutines (8 of 8)
-# Skill: Turret Destabilization
+# Skill: Weapon Destabilization
 type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
diff --git a/eos/effects/ewskilltrackingdisruptiontrackingspeedbonus.py b/eos/effects/ewskilltrackingdisruptiontrackingspeedbonus.py
index 65bba385ea..8327699cdb 100644
--- a/eos/effects/ewskilltrackingdisruptiontrackingspeedbonus.py
+++ b/eos/effects/ewskilltrackingdisruptiontrackingspeedbonus.py
@@ -2,7 +2,7 @@
 #
 # Used by:
 # Modules named like: Tracking Diagnostic Subroutines (8 of 8)
-# Skill: Turret Destabilization
+# Skill: Weapon Destabilization
 type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
diff --git a/eos/effects/expeditionfrigatebonusiceharvestingcycletime2.py b/eos/effects/expeditionfrigatebonusiceharvestingcycletime2.py
index 0d8078335d..c4a9204d18 100644
--- a/eos/effects/expeditionfrigatebonusiceharvestingcycletime2.py
+++ b/eos/effects/expeditionfrigatebonusiceharvestingcycletime2.py
@@ -1,3 +1,7 @@
+# expeditionFrigateBonusIceHarvestingCycleTime2
+#
+# Used by:
+# Ship: Endurance
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"), "duration", src.getModifiedItemAttr("eliteBonusExpedition2"), skill="Expedition Frigates")
diff --git a/eos/effects/expeditionfrigateshieldresistance1.py b/eos/effects/expeditionfrigateshieldresistance1.py
index 463fe8028a..404e2c0721 100644
--- a/eos/effects/expeditionfrigateshieldresistance1.py
+++ b/eos/effects/expeditionfrigateshieldresistance1.py
@@ -1,3 +1,7 @@
+# expeditionFrigateShieldResistance1
+#
+# Used by:
+# Ship: Endurance
 type = "passive"
 def handler(fit, src, context):
     fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("eliteBonusExpedition1"), skill="Expedition Frigates")
diff --git a/eos/effects/ganginformationwarfaresuperiorityall.py b/eos/effects/ganginformationwarfaresuperiorityall.py
deleted file mode 100644
index 605896a820..0000000000
--- a/eos/effects/ganginformationwarfaresuperiorityall.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# gangInformationWarfareSuperiorityAll
-#
-# Used by:
-# Variations of module: Information Warfare Link - Electronic Superiority I (2 of 2)
-type = "active"
-def handler(fit, module, context):
-    module.multiplyItemAttr("commandBonusTD", module.getModifiedItemAttr("commandBonusHidden"))
-    module.multiplyItemAttr("commandBonusECM", module.getModifiedItemAttr("commandBonusHidden"))
-    module.multiplyItemAttr("commandBonusRSD", module.getModifiedItemAttr("commandBonusHidden"))
-    module.multiplyItemAttr("commandBonusTP", module.getModifiedItemAttr("commandBonusHidden"))
diff --git a/eos/effects/ganginformationwarfaresuperiorityall2.py b/eos/effects/ganginformationwarfaresuperiorityall2.py
index 9dc9cd81cf..da72b30f4e 100644
--- a/eos/effects/ganginformationwarfaresuperiorityall2.py
+++ b/eos/effects/ganginformationwarfaresuperiorityall2.py
@@ -1,3 +1,7 @@
+# gangInformationWarfareSuperiorityAll2
+#
+# Used by:
+# Variations of module: Information Warfare Link - Electronic Superiority I (2 of 2)
 type = "active"
 def handler(fit, module, context):
     module.multiplyItemAttr("commandBonusTD", module.getModifiedItemAttr("commandBonusHidden"))
diff --git a/eos/effects/gunneryfalloffbonusonline.py b/eos/effects/gunneryfalloffbonusonline.py
index 40d31d1a1f..9fcf5d120b 100644
--- a/eos/effects/gunneryfalloffbonusonline.py
+++ b/eos/effects/gunneryfalloffbonusonline.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Modules from group: Tracking Enhancer (17 of 17)
+# Module: QA Damage Module
 type = "passive"
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
diff --git a/eos/effects/gunnerymaxrangebonusonline.py b/eos/effects/gunnerymaxrangebonusonline.py
index 69d3a474c8..3cb3d06185 100644
--- a/eos/effects/gunnerymaxrangebonusonline.py
+++ b/eos/effects/gunnerymaxrangebonusonline.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Modules from group: Tracking Enhancer (17 of 17)
+# Module: QA Damage Module
 type = "passive"
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
diff --git a/eos/effects/gunnerytrackingspeedbonusonline.py b/eos/effects/gunnerytrackingspeedbonusonline.py
index 58dadf2f85..03469b881b 100644
--- a/eos/effects/gunnerytrackingspeedbonusonline.py
+++ b/eos/effects/gunnerytrackingspeedbonusonline.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Modules from group: Tracking Enhancer (17 of 17)
+# Module: QA Damage Module
 type = "passive"
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
diff --git a/eos/effects/iceharvesterdurationmultiplier.py b/eos/effects/iceharvesterdurationmultiplier.py
index 4019c80633..5a95a72dfd 100644
--- a/eos/effects/iceharvesterdurationmultiplier.py
+++ b/eos/effects/iceharvesterdurationmultiplier.py
@@ -3,6 +3,7 @@
 # Used by:
 # Variations of ship: Procurer (2 of 2)
 # Variations of ship: Retriever (2 of 2)
+# Ship: Endurance
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Ice Harvesting"),
diff --git a/eos/effects/ignorecloakvelocitypenalty.py b/eos/effects/ignorecloakvelocitypenalty.py
index 7b0e9e80bf..bcb46a480e 100644
--- a/eos/effects/ignorecloakvelocitypenalty.py
+++ b/eos/effects/ignorecloakvelocitypenalty.py
@@ -1,3 +1,7 @@
+# ignoreCloakVelocityPenalty
+#
+# Used by:
+# Ship: Endurance
 type = "passive"
 runTime = "early"
 def handler(fit, src, context):
diff --git a/eos/effects/informationwarfaremindlinkhidden.py b/eos/effects/informationwarfaremindlinkhidden.py
index 6d3d6c6a7f..f59c806ba5 100644
--- a/eos/effects/informationwarfaremindlinkhidden.py
+++ b/eos/effects/informationwarfaremindlinkhidden.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Implant: Caldari Navy Warfare Mindlink
+# Implant: Imperial Navy Warfare Mindlink
 # Implant: Information Warfare Mindlink
 type = "passive"
 def handler(fit, implant, context):
diff --git a/eos/effects/leech.py b/eos/effects/leech.py
deleted file mode 100644
index dd5f171b4b..0000000000
--- a/eos/effects/leech.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# leech
-#
-# Used by:
-# Modules from group: Energy Vampire (52 of 52)
-type = "active", "projected"
-runTime = "late"
-def handler(fit, module, context):
-    amount = module.getModifiedItemAttr("powerTransferAmount")
-    time = module.getModifiedItemAttr("duration")
-    if "projected" in context:
-        fit.addDrain(time, amount, 0)
-    elif "module" in context:
-        module.itemModifiedAttributes.force("capacitorNeed", -amount)
diff --git a/eos/effects/miningfrigatebonusiceharvestingcycletime2.py b/eos/effects/miningfrigatebonusiceharvestingcycletime2.py
index 2a25c961d5..e16c8ef865 100644
--- a/eos/effects/miningfrigatebonusiceharvestingcycletime2.py
+++ b/eos/effects/miningfrigatebonusiceharvestingcycletime2.py
@@ -1,3 +1,7 @@
+# miningFrigateBonusIceHarvestingCycleTime2
+#
+# Used by:
+# Ship: Endurance
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"), "duration", src.getModifiedItemAttr("shipBonusOREfrig2"), skill="Mining Frigate")
diff --git a/eos/effects/mininglaser.py b/eos/effects/mininglaser.py
index a4095f4ed1..6189b79830 100644
--- a/eos/effects/mininglaser.py
+++ b/eos/effects/mininglaser.py
@@ -2,7 +2,7 @@
 #
 # Used by:
 # Modules from group: Frequency Mining Laser (3 of 3)
-# Modules from group: Mining Laser (12 of 12)
+# Modules from group: Mining Laser (15 of 15)
 # Modules from group: Strip Miner (5 of 5)
 type = 'active'
 def handler(fit, module, context):
diff --git a/eos/effects/miningyieldmultiplypassive.py b/eos/effects/miningyieldmultiplypassive.py
index 5c6aee92f9..8645a370f4 100644
--- a/eos/effects/miningyieldmultiplypassive.py
+++ b/eos/effects/miningyieldmultiplypassive.py
@@ -1,9 +1,10 @@
 # miningYieldMultiplyPassive
 #
 # Used by:
+# Ships from group: Expedition Frigate (2 of 2)
 # Variations of ship: Procurer (2 of 2)
 # Variations of ship: Retriever (2 of 2)
-# Variations of ship: Venture (2 of 2)
+# Ship: Venture
 type = "passive"
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Mining"),
diff --git a/eos/effects/minmatarshipewtargetpaintermf2.py b/eos/effects/minmatarshipewtargetpaintermf2.py
index 43dcdcc78e..556db7d5bf 100644
--- a/eos/effects/minmatarshipewtargetpaintermf2.py
+++ b/eos/effects/minmatarshipewtargetpaintermf2.py
@@ -1,7 +1,8 @@
 # minmatarShipEwTargetPainterMF2
 #
 # Used by:
-# Variations of ship: Vigil (2 of 2)
+# Ship: Hyena
+# Ship: Vigil
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
diff --git a/eos/effects/modifypowerrechargerate.py b/eos/effects/modifypowerrechargerate.py
index 4f1e35a4b7..c06cac1142 100644
--- a/eos/effects/modifypowerrechargerate.py
+++ b/eos/effects/modifypowerrechargerate.py
@@ -6,8 +6,7 @@
 # Modules from group: Capacitor Recharger (18 of 18)
 # Modules from group: Power Diagnostic System (23 of 23)
 # Modules from group: Reactor Control Unit (22 of 22)
-# Modules from group: Shield Flux Coil (11 of 11)
-# Modules from group: Shield Power Relay (11 of 11)
+# Modules from group: Shield Power Relay (6 of 6)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("rechargeRate", module.getModifiedItemAttr("capacitorRechargeRateMultiplier"))
\ No newline at end of file
diff --git a/eos/effects/modifyshieldrechargerate.py b/eos/effects/modifyshieldrechargerate.py
index 1986cbb09f..845ba17887 100644
--- a/eos/effects/modifyshieldrechargerate.py
+++ b/eos/effects/modifyshieldrechargerate.py
@@ -1,12 +1,11 @@
 # modifyShieldRechargeRate
 #
 # Used by:
-# Modules from group: Capacitor Flux Coil (6 of 6)
 # Modules from group: Capacitor Power Relay (20 of 20)
 # Modules from group: Power Diagnostic System (23 of 23)
 # Modules from group: Reactor Control Unit (22 of 22)
-# Modules from group: Shield Flux Coil (11 of 11)
-# Modules from group: Shield Recharger (6 of 6)
+# Modules from group: Shield Recharger (4 of 4)
+# Modules named like: Flux Coil (12 of 12)
 # Modules named like: QA Multiship Module Players (4 of 4)
 type = "passive"
 def handler(fit, module, context):
diff --git a/eos/effects/orecapitalshipshieldtransferfalloff.py b/eos/effects/orecapitalshipshieldtransferfalloff.py
index 6e3e7245bc..b1c8702eb5 100644
--- a/eos/effects/orecapitalshipshieldtransferfalloff.py
+++ b/eos/effects/orecapitalshipshieldtransferfalloff.py
@@ -1,3 +1,7 @@
+# oreCapitalShipShieldTransferFalloff
+#
+# Used by:
+# Ship: Rorqual
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"), "falloffEffectiveness", src.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships")
diff --git a/eos/effects/overloadselfdurationbonus.py b/eos/effects/overloadselfdurationbonus.py
index 29ede57900..984b066390 100644
--- a/eos/effects/overloadselfdurationbonus.py
+++ b/eos/effects/overloadselfdurationbonus.py
@@ -2,14 +2,14 @@
 #
 # Used by:
 # Modules from group: Capacitor Booster (54 of 54)
-# Modules from group: Energy Destabilizer (41 of 41)
-# Modules from group: Energy Vampire (52 of 52)
+# Modules from group: Energy Neutralizer (45 of 45)
+# Modules from group: Energy Nosferatu (45 of 45)
 # Modules from group: Hull Repair Unit (21 of 21)
-# Modules from group: Remote Armor Repairer (38 of 38)
+# Modules from group: Remote Armor Repairer (33 of 33)
 # Modules from group: Remote Capacitor Transmitter (38 of 38)
-# Modules from group: Remote Shield Booster (39 of 39)
+# Modules from group: Remote Shield Booster (31 of 31)
 # Modules from group: Smart Bomb (118 of 118)
-# Modules from group: Warp Disrupt Field Generator (2 of 2)
+# Modules from group: Warp Disrupt Field Generator (7 of 7)
 # Module: QA Remote Armor Repair System - 5 Players
 # Module: QA Shield Transporter - 5 Players
 # Module: Reactive Armor Hardener
diff --git a/eos/effects/overloadselfmissileguidancemodulebonus.py b/eos/effects/overloadselfmissileguidancemodulebonus.py
index 09a75f04c4..da798b80ba 100644
--- a/eos/effects/overloadselfmissileguidancemodulebonus.py
+++ b/eos/effects/overloadselfmissileguidancemodulebonus.py
@@ -1,3 +1,7 @@
+# overloadSelfMissileGuidanceModuleBonus
+#
+# Used by:
+# Variations of module: Guidance Disruptor I (6 of 6)
 type = "overheat"
 def handler(fit, module, context):
     for tgtAttr in (
diff --git a/eos/effects/overloadselfsensormodulebonus.py b/eos/effects/overloadselfsensormodulebonus.py
index eb5984d564..859e4830b4 100644
--- a/eos/effects/overloadselfsensormodulebonus.py
+++ b/eos/effects/overloadselfsensormodulebonus.py
@@ -2,7 +2,7 @@
 #
 # Used by:
 # Modules from group: Remote Sensor Booster (8 of 8)
-# Modules from group: Remote Sensor Damper (9 of 9)
+# Modules from group: Remote Sensor Damper (8 of 8)
 # Modules from group: Sensor Booster (12 of 12)
 type = "overheat"
 def handler(fit, module, context):
diff --git a/eos/effects/overloadselftrackingmodulebonus.py b/eos/effects/overloadselftrackingmodulebonus.py
index e1ca68807c..1d5385df68 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 (8 of 8)
+# Variations of module: Tracking Disruptor I (6 of 6)
 type = "overheat"
 def handler(fit, module, context):
     module.boostItemAttr("maxRangeBonus", module.getModifiedItemAttr("overloadTrackingModuleStrengthBonus"))
diff --git a/eos/effects/passivespeedlimit.py b/eos/effects/passivespeedlimit.py
index 94b4ed8a27..95e8328731 100644
--- a/eos/effects/passivespeedlimit.py
+++ b/eos/effects/passivespeedlimit.py
@@ -1,7 +1,7 @@
 # passiveSpeedLimit
 #
 # Used by:
-# Modules from group: Entosis Link (2 of 2)
+# Modules from group: Entosis Link (6 of 6)
 runtime = "late"
 type = "passive"
 def handler(fit, src, context):
diff --git a/eos/effects/poweroutputmultiply.py b/eos/effects/poweroutputmultiply.py
index e0ac4fe578..9d3f66082f 100644
--- a/eos/effects/poweroutputmultiply.py
+++ b/eos/effects/poweroutputmultiply.py
@@ -5,8 +5,6 @@
 # Modules from group: Capacitor Power Relay (20 of 20)
 # Modules from group: Power Diagnostic System (23 of 23)
 # Modules from group: Reactor Control Unit (22 of 22)
-# Modules from group: Shield Flux Coil (11 of 11)
-# Modules from group: Shield Power Relay (11 of 11)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("powerOutput", module.getModifiedItemAttr("powerOutputMultiplier"))
\ No newline at end of file
diff --git a/eos/effects/remotearmorrepairfalloff.py b/eos/effects/remotearmorrepairfalloff.py
index 98cdd3f67a..ed5b389697 100644
--- a/eos/effects/remotearmorrepairfalloff.py
+++ b/eos/effects/remotearmorrepairfalloff.py
@@ -1,3 +1,7 @@
+# remoteArmorRepairFalloff
+#
+# Used by:
+# Modules from group: Remote Armor Repairer (33 of 33)
 type = "projected", "active"
 def handler(fit, container, context):
     if "projected" in context:
diff --git a/eos/effects/remotehullrepair.py b/eos/effects/remotehullrepair.py
index bb15c0a112..1bf1fd50a0 100644
--- a/eos/effects/remotehullrepair.py
+++ b/eos/effects/remotehullrepair.py
@@ -1,7 +1,6 @@
 # remoteHullRepair
 #
 # Used by:
-# Modules from group: Remote Hull Repairer (7 of 7)
 # Drones named like: Hull Maintenance Bot (6 of 6)
 type = "projected", "active"
 runTime = "late"
diff --git a/eos/effects/remotehullrepairfalloff.py b/eos/effects/remotehullrepairfalloff.py
index bb15c0a112..99b1adc55e 100644
--- a/eos/effects/remotehullrepairfalloff.py
+++ b/eos/effects/remotehullrepairfalloff.py
@@ -1,8 +1,7 @@
-# remoteHullRepair
+# remoteHullRepairFalloff
 #
 # Used by:
 # Modules from group: Remote Hull Repairer (7 of 7)
-# Drones named like: Hull Maintenance Bot (6 of 6)
 type = "projected", "active"
 runTime = "late"
 def handler(fit, module, context):
diff --git a/eos/effects/remoteshieldtransferfalloff.py b/eos/effects/remoteshieldtransferfalloff.py
index 317d61a267..2bf11e9d6c 100644
--- a/eos/effects/remoteshieldtransferfalloff.py
+++ b/eos/effects/remoteshieldtransferfalloff.py
@@ -1,3 +1,7 @@
+# remoteShieldTransferFalloff
+#
+# Used by:
+# Modules from group: Remote Shield Booster (31 of 31)
 type = "projected", "active"
 def handler(fit, container, context):
     if "projected" in context:
diff --git a/eos/effects/rolebonuscdlinkspgreduction.py b/eos/effects/rolebonuscdlinkspgreduction.py
index e85f496ded..bfbc05f264 100644
--- a/eos/effects/rolebonuscdlinkspgreduction.py
+++ b/eos/effects/rolebonuscdlinkspgreduction.py
@@ -1,3 +1,7 @@
+# roleBonusCDLinksPGReduction
+#
+# Used by:
+# Ships from group: Command Destroyers (4 of 4)
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Leadership"), "power", src.getModifiedItemAttr("roleBonusCD"))
diff --git a/eos/effects/rolebonusecmcapcpu.py b/eos/effects/rolebonusecmcapcpu.py
index b357fa216c..a9bd4e612b 100644
--- a/eos/effects/rolebonusecmcapcpu.py
+++ b/eos/effects/rolebonusecmcapcpu.py
@@ -1,3 +1,7 @@
+# roleBonusECMCapCPU
+#
+# Used by:
+# Ship: Griffin Navy Issue
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "capacitorNeed", src.getModifiedItemAttr("roleBonus"))
diff --git a/eos/effects/rolebonusecmrange.py b/eos/effects/rolebonusecmrange.py
index 15978730d7..dbf1a08f44 100644
--- a/eos/effects/rolebonusecmrange.py
+++ b/eos/effects/rolebonusecmrange.py
@@ -1,3 +1,7 @@
+# roleBonusECMRange
+#
+# Used by:
+# Ship: Griffin Navy Issue
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "falloff", src.getModifiedItemAttr("roleBonus"))
diff --git a/eos/effects/rolebonusjustscramblerstrength.py b/eos/effects/rolebonusjustscramblerstrength.py
index cbf2667e27..588d7b3215 100644
--- a/eos/effects/rolebonusjustscramblerstrength.py
+++ b/eos/effects/rolebonusjustscramblerstrength.py
@@ -1,3 +1,7 @@
+# roleBonusJustScramblerStrength
+#
+# Used by:
+# Ship: Maulus Navy Issue
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Navigation"),
diff --git a/eos/effects/rolebonusstasisrange.py b/eos/effects/rolebonusstasisrange.py
index b3e62a1bdc..2afc333cef 100644
--- a/eos/effects/rolebonusstasisrange.py
+++ b/eos/effects/rolebonusstasisrange.py
@@ -1,3 +1,7 @@
+# roleBonusStasisRange
+#
+# Used by:
+# Ship: Vigil Fleet Issue
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange", src.getModifiedItemAttr("roleBonus"))
diff --git a/eos/effects/rolebonuswdcapcpu.py b/eos/effects/rolebonuswdcapcpu.py
index 946dadde45..1805cfd3de 100644
--- a/eos/effects/rolebonuswdcapcpu.py
+++ b/eos/effects/rolebonuswdcapcpu.py
@@ -1,3 +1,7 @@
+# roleBonusWDCapCPU
+#
+# Used by:
+# Ship: Crucifier Navy Issue
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "cpu", src.getModifiedItemAttr("roleBonus"))
diff --git a/eos/effects/rolebonuswdrange.py b/eos/effects/rolebonuswdrange.py
index 91074db2dc..6e653055ef 100644
--- a/eos/effects/rolebonuswdrange.py
+++ b/eos/effects/rolebonuswdrange.py
@@ -1,3 +1,7 @@
+# roleBonusWDRange
+#
+# Used by:
+# Ship: Crucifier Navy Issue
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "falloff", src.getModifiedItemAttr("roleBonus"))
diff --git a/eos/effects/scriptmissileguidancecomputeraoecloudsizebonusbonus.py b/eos/effects/scriptmissileguidancecomputeraoecloudsizebonusbonus.py
index d83cdc9074..c97e060f7d 100644
--- a/eos/effects/scriptmissileguidancecomputeraoecloudsizebonusbonus.py
+++ b/eos/effects/scriptmissileguidancecomputeraoecloudsizebonusbonus.py
@@ -1,7 +1,7 @@
 # scriptMissileGuidanceComputerAOECloudSizeBonusBonus
 #
 # Used by:
-# Charges from group: Missile Guidance Script (2 of 2)
+# Charges named like: Missile Script (4 of 4)
 type = "passive"
 def handler(fit, module, context):
     module.boostItemAttr("aoeCloudSizeBonus", module.getModifiedChargeAttr("aoeCloudSizeBonusBonus"))
diff --git a/eos/effects/scriptmissileguidancecomputeraoevelocitybonusbonus.py b/eos/effects/scriptmissileguidancecomputeraoevelocitybonusbonus.py
index 8a0f956ea0..0f7d967348 100644
--- a/eos/effects/scriptmissileguidancecomputeraoevelocitybonusbonus.py
+++ b/eos/effects/scriptmissileguidancecomputeraoevelocitybonusbonus.py
@@ -1,7 +1,7 @@
 # scriptMissileGuidanceComputerAOEVelocityBonusBonus
 #
 # Used by:
-# Charges from group: Missile Guidance Script (2 of 2)
+# Charges named like: Missile Script (4 of 4)
 type = "passive"
 def handler(fit, module, context):
     module.boostItemAttr("aoeVelocityBonus", module.getModifiedChargeAttr("aoeVelocityBonusBonus"))
diff --git a/eos/effects/scriptmissileguidancecomputerexplosiondelaybonusbonus.py b/eos/effects/scriptmissileguidancecomputerexplosiondelaybonusbonus.py
index 186bbc6353..5f58e16866 100644
--- a/eos/effects/scriptmissileguidancecomputerexplosiondelaybonusbonus.py
+++ b/eos/effects/scriptmissileguidancecomputerexplosiondelaybonusbonus.py
@@ -1,7 +1,7 @@
 # scriptMissileGuidanceComputerExplosionDelayBonusBonus
 #
 # Used by:
-# Charges from group: Missile Guidance Script (2 of 2)
+# Charges named like: Missile Script (4 of 4)
 type = "passive"
 def handler(fit, module, context):
     module.boostItemAttr("explosionDelayBonus", module.getModifiedChargeAttr("explosionDelayBonusBonus"))
diff --git a/eos/effects/scriptmissileguidancecomputermissilevelocitybonusbonus.py b/eos/effects/scriptmissileguidancecomputermissilevelocitybonusbonus.py
index 8ab36f8a83..31859dbc9b 100644
--- a/eos/effects/scriptmissileguidancecomputermissilevelocitybonusbonus.py
+++ b/eos/effects/scriptmissileguidancecomputermissilevelocitybonusbonus.py
@@ -1,7 +1,7 @@
 # scriptMissileGuidanceComputerMissileVelocityBonusBonus
 #
 # Used by:
-# Charges from group: Missile Guidance Script (2 of 2)
+# Charges named like: Missile Script (4 of 4)
 type = "passive"
 def handler(fit, module, context):
     module.boostItemAttr("missileVelocityBonus", module.getModifiedChargeAttr("missileVelocityBonusBonus"))
diff --git a/eos/effects/shieldcapacitymultiply.py b/eos/effects/shieldcapacitymultiply.py
index 9cf482cc78..ea6bfa8c66 100644
--- a/eos/effects/shieldcapacitymultiply.py
+++ b/eos/effects/shieldcapacitymultiply.py
@@ -1,12 +1,10 @@
 # shieldCapacityMultiply
 #
 # Used by:
-# Modules from group: Capacitor Flux Coil (6 of 6)
 # Modules from group: Capacitor Power Relay (20 of 20)
 # Modules from group: Power Diagnostic System (23 of 23)
 # Modules from group: Reactor Control Unit (22 of 22)
-# Modules from group: Shield Flux Coil (11 of 11)
-# Modules from group: Shield Power Relay (11 of 11)
+# Modules named like: Flux Coil (12 of 12)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("shieldCapacity", module.getModifiedItemAttr("shieldCapacityMultiplier"))
\ No newline at end of file
diff --git a/eos/effects/shieldoperationrechargeratebonuspostpercentonline.py b/eos/effects/shieldoperationrechargeratebonuspostpercentonline.py
index 4b386e993f..c5f89daf0a 100644
--- a/eos/effects/shieldoperationrechargeratebonuspostpercentonline.py
+++ b/eos/effects/shieldoperationrechargeratebonuspostpercentonline.py
@@ -1,7 +1,7 @@
 # shieldOperationRechargeratebonusPostPercentOnline
 #
 # Used by:
-# Modules from group: Shield Power Relay (11 of 11)
+# Modules from group: Shield Power Relay (6 of 6)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.boostItemAttr("shieldRechargeRate", module.getModifiedItemAttr("rechargeratebonus") or 0)
diff --git a/eos/effects/shieldtransfer.py b/eos/effects/shieldtransfer.py
index b643d4ced4..c5a95088ea 100644
--- a/eos/effects/shieldtransfer.py
+++ b/eos/effects/shieldtransfer.py
@@ -1,7 +1,6 @@
 # shieldTransfer
 #
 # Used by:
-# Modules from group: Remote Shield Booster (39 of 39)
 # Drones named like: Shield Maintenance Bot (6 of 6)
 # Module: QA Shield Transporter - 5 Players
 type = "projected", "active"
diff --git a/eos/effects/shieldtransporterfalloffbonus.py b/eos/effects/shieldtransporterfalloffbonus.py
index f133337e99..80c2b5de7e 100644
--- a/eos/effects/shieldtransporterfalloffbonus.py
+++ b/eos/effects/shieldtransporterfalloffbonus.py
@@ -1,3 +1,10 @@
+# shieldTransporterFalloffBonus
+#
+# Used by:
+# Variations of ship: Bantam (2 of 2)
+# Variations of ship: Burst (2 of 2)
+# Ship: Osprey
+# Ship: Scythe
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", "falloffEffectiveness", src.getModifiedItemAttr("falloffBonus"))
diff --git a/eos/effects/shieldtransportermaxrangebonus.py b/eos/effects/shieldtransportermaxrangebonus.py
index bf1e1eafb9..77f1d2a2e3 100644
--- a/eos/effects/shieldtransportermaxrangebonus.py
+++ b/eos/effects/shieldtransportermaxrangebonus.py
@@ -1,8 +1,6 @@
 # shieldTransporterMaxRangeBonus
 #
 # Used by:
-# Ship: Bantam
-# Ship: Burst
 # Ship: Osprey
 # Ship: Scythe
 type = "passive"
diff --git a/eos/effects/shipbonusaoevelocityrocketsmf.py b/eos/effects/shipbonusaoevelocityrocketsmf.py
index 676ddde500..c67e6a4a9c 100644
--- a/eos/effects/shipbonusaoevelocityrocketsmf.py
+++ b/eos/effects/shipbonusaoevelocityrocketsmf.py
@@ -1,3 +1,7 @@
+# shipBonusAoeVelocityRocketsMF
+#
+# Used by:
+# Ship: Vigil Fleet Issue
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "aoeVelocity", src.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/shipbonusdronedamagemultiplierad1.py b/eos/effects/shipbonusdronedamagemultiplierad1.py
index 9cd98d219f..b18b20bcba 100644
--- a/eos/effects/shipbonusdronedamagemultiplierad1.py
+++ b/eos/effects/shipbonusdronedamagemultiplierad1.py
@@ -1,3 +1,7 @@
+# shipBonusDroneDamageMultiplierAD1
+#
+# Used by:
+# Variations of ship: Dragoon (2 of 2)
 type = "passive"
 def handler(fit, src, context):
     fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier", src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
diff --git a/eos/effects/shipbonusdronedamagemultipliergd1.py b/eos/effects/shipbonusdronedamagemultipliergd1.py
index e6fd67d68c..b033f6d34e 100644
--- a/eos/effects/shipbonusdronedamagemultipliergd1.py
+++ b/eos/effects/shipbonusdronedamagemultipliergd1.py
@@ -1,3 +1,7 @@
+# shipBonusDroneDamageMultiplierGD1
+#
+# Used by:
+# Variations of ship: Algos (2 of 2)
 type = "passive"
 def handler(fit, src, context):
     fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier", src.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer")
diff --git a/eos/effects/shipbonusdronehitpointsad1.py b/eos/effects/shipbonusdronehitpointsad1.py
index 72ee19bd9f..3caf0535b7 100644
--- a/eos/effects/shipbonusdronehitpointsad1.py
+++ b/eos/effects/shipbonusdronehitpointsad1.py
@@ -1,3 +1,7 @@
+# shipBonusDroneHitpointsAD1
+#
+# Used by:
+# Variations of ship: Dragoon (2 of 2)
 type = "passive"
 def handler(fit, src, context):
     fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "shieldCapacity", src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
diff --git a/eos/effects/shipbonusdronehitpointsgd1.py b/eos/effects/shipbonusdronehitpointsgd1.py
index bc6c685d30..9866837014 100644
--- a/eos/effects/shipbonusdronehitpointsgd1.py
+++ b/eos/effects/shipbonusdronehitpointsgd1.py
@@ -1,3 +1,7 @@
+# shipBonusDroneHitpointsGD1
+#
+# Used by:
+# Variations of ship: Algos (2 of 2)
 type = "passive"
 def handler(fit, src, context):
     fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "shieldCapacity", src.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer")
diff --git a/eos/effects/shipbonusdronehitpointsgf.py b/eos/effects/shipbonusdronehitpointsgf.py
index 2ca7e2a3e3..03f6cf7294 100644
--- a/eos/effects/shipbonusdronehitpointsgf.py
+++ b/eos/effects/shipbonusdronehitpointsgf.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Astero
+# Ship: Maulus Navy Issue
 # Ship: Tristan
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipbonusdronetrackinggf.py b/eos/effects/shipbonusdronetrackinggf.py
index a2996a41e1..c6ec28d2cb 100644
--- a/eos/effects/shipbonusdronetrackinggf.py
+++ b/eos/effects/shipbonusdronetrackinggf.py
@@ -1,6 +1,7 @@
 # shipBonusDroneTrackingGF
 #
 # Used by:
+# Ship: Maulus Navy Issue
 # Ship: Tristan
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipbonusemarmorresistancead2.py b/eos/effects/shipbonusemarmorresistancead2.py
index 38047ac08b..7bc317a77a 100644
--- a/eos/effects/shipbonusemarmorresistancead2.py
+++ b/eos/effects/shipbonusemarmorresistancead2.py
@@ -1,3 +1,7 @@
+# shipBonusEMArmorResistanceAD2
+#
+# Used by:
+# Ship: Pontifex
 type = "passive"
 def handler(fit, src, context):
     fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
diff --git a/eos/effects/shipbonusemarmorresistancegd2.py b/eos/effects/shipbonusemarmorresistancegd2.py
index 9b8a9ac4d1..bd2d537244 100644
--- a/eos/effects/shipbonusemarmorresistancegd2.py
+++ b/eos/effects/shipbonusemarmorresistancegd2.py
@@ -1,3 +1,7 @@
+# shipBonusEMArmorResistanceGD2
+#
+# Used by:
+# Ship: Magus
 type = "passive"
 def handler(fit, src, context):
     fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("shipBonusGD2"), skill="Gallente Destroyer")
diff --git a/eos/effects/shipbonusemmissiledamagecd1.py b/eos/effects/shipbonusemmissiledamagecd1.py
index 06627549e0..4c5a36d8fe 100644
--- a/eos/effects/shipbonusemmissiledamagecd1.py
+++ b/eos/effects/shipbonusemmissiledamagecd1.py
@@ -1,3 +1,7 @@
+# shipBonusEMMissileDamageCD1
+#
+# Used by:
+# Ship: Stork
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "emDamage", src.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer")
diff --git a/eos/effects/shipbonusemmissiledmgmd1.py b/eos/effects/shipbonusemmissiledmgmd1.py
index d7b5d731de..9f1e5175c8 100644
--- a/eos/effects/shipbonusemmissiledmgmd1.py
+++ b/eos/effects/shipbonusemmissiledmgmd1.py
@@ -1,3 +1,7 @@
+# shipBonusEMMissileDmgMD1
+#
+# Used by:
+# Ship: Bifrost
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "emDamage", src.getModifiedItemAttr("shipBonusMD1"), skill="Minmatar Destroyer")
diff --git a/eos/effects/shipbonusemshieldresistancemd2.py b/eos/effects/shipbonusemshieldresistancemd2.py
index 423fde35e3..c25f179dad 100644
--- a/eos/effects/shipbonusemshieldresistancemd2.py
+++ b/eos/effects/shipbonusemshieldresistancemd2.py
@@ -1,3 +1,7 @@
+# shipBonusEMShieldResistanceMD2
+#
+# Used by:
+# Ship: Bifrost
 type = "passive"
 def handler(fit, src, context):
     fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusMD2"), skill="Minmatar Destroyer")
diff --git a/eos/effects/shipbonusenergyneutfalloffab2.py b/eos/effects/shipbonusenergyneutfalloffab2.py
index 40810e2c94..e49217c816 100644
--- a/eos/effects/shipbonusenergyneutfalloffab2.py
+++ b/eos/effects/shipbonusenergyneutfalloffab2.py
@@ -1,3 +1,7 @@
+# shipBonusEnergyNeutFalloffAB2
+#
+# Used by:
+# Ship: Armageddon
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness", src.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")
diff --git a/eos/effects/shipbonusenergyneutfalloffac3.py b/eos/effects/shipbonusenergyneutfalloffac3.py
index a208cf28b4..3434e69888 100644
--- a/eos/effects/shipbonusenergyneutfalloffac3.py
+++ b/eos/effects/shipbonusenergyneutfalloffac3.py
@@ -1,3 +1,7 @@
+# shipBonusEnergyNeutFalloffAC3
+#
+# Used by:
+# Ship: Vangel
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness", src.getModifiedItemAttr("shipBonusAC3"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipbonusenergyneutfalloffad1.py b/eos/effects/shipbonusenergyneutfalloffad1.py
index c6eaf36057..cf34118ff9 100644
--- a/eos/effects/shipbonusenergyneutfalloffad1.py
+++ b/eos/effects/shipbonusenergyneutfalloffad1.py
@@ -1,3 +1,7 @@
+# shipBonusEnergyNeutFalloffAD1
+#
+# Used by:
+# Ship: Dragoon
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness", src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
diff --git a/eos/effects/shipbonusenergyneutfalloffaf3.py b/eos/effects/shipbonusenergyneutfalloffaf3.py
index 835aa27b31..248ed9f360 100644
--- a/eos/effects/shipbonusenergyneutfalloffaf3.py
+++ b/eos/effects/shipbonusenergyneutfalloffaf3.py
@@ -1,3 +1,7 @@
+# shipBonusEnergyNeutFalloffAF3
+#
+# Used by:
+# Ship: Malice
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness", src.getModifiedItemAttr("shipBonus3AF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipbonusenergyneutfalloffeaf3.py b/eos/effects/shipbonusenergyneutfalloffeaf3.py
index 1f704ed709..f4a99fa853 100644
--- a/eos/effects/shipbonusenergyneutfalloffeaf3.py
+++ b/eos/effects/shipbonusenergyneutfalloffeaf3.py
@@ -1,3 +1,7 @@
+# shipBonusEnergyNeutFalloffEAF3
+#
+# Used by:
+# Ship: Sentinel
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness", src.getModifiedItemAttr("eliteBonusElectronicAttackShip3"), skill="Electronic Attack Ships")
diff --git a/eos/effects/shipbonusenergyneutfalloffrs2.py b/eos/effects/shipbonusenergyneutfalloffrs2.py
index 017a8b6673..350e3d1993 100644
--- a/eos/effects/shipbonusenergyneutfalloffrs2.py
+++ b/eos/effects/shipbonusenergyneutfalloffrs2.py
@@ -1,3 +1,7 @@
+# shipBonusEnergyNeutFalloffRS2
+#
+# Used by:
+# Ship: Pilgrim
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness", src.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")
diff --git a/eos/effects/shipbonusenergyneutfalloffrs3.py b/eos/effects/shipbonusenergyneutfalloffrs3.py
index 2d242ac210..f3396dc37a 100644
--- a/eos/effects/shipbonusenergyneutfalloffrs3.py
+++ b/eos/effects/shipbonusenergyneutfalloffrs3.py
@@ -1,3 +1,7 @@
+# shipBonusEnergyNeutFalloffRS3
+#
+# Used by:
+# Ship: Curse
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness", src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/shipbonusenergyneutoptimalab.py b/eos/effects/shipbonusenergyneutoptimalab.py
index 2d1e087254..7e887f0e6f 100644
--- a/eos/effects/shipbonusenergyneutoptimalab.py
+++ b/eos/effects/shipbonusenergyneutoptimalab.py
@@ -1,3 +1,7 @@
+# shipBonusEnergyNeutOptimalAB
+#
+# Used by:
+# Ship: Armageddon
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange", src.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/shipbonusenergyneutoptimalac1.py b/eos/effects/shipbonusenergyneutoptimalac1.py
index 580663cd9c..b66e58a461 100644
--- a/eos/effects/shipbonusenergyneutoptimalac1.py
+++ b/eos/effects/shipbonusenergyneutoptimalac1.py
@@ -1,3 +1,7 @@
+# shipBonusEnergyNeutOptimalAC1
+#
+# Used by:
+# Ship: Vangel
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange", src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipbonusenergyneutoptimalad2.py b/eos/effects/shipbonusenergyneutoptimalad2.py
index d2c4a4e375..682a574adb 100644
--- a/eos/effects/shipbonusenergyneutoptimalad2.py
+++ b/eos/effects/shipbonusenergyneutoptimalad2.py
@@ -1,3 +1,7 @@
+# shipBonusEnergyNeutOptimalAD2
+#
+# Used by:
+# Ship: Dragoon
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange", src.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
diff --git a/eos/effects/shipbonusenergyneutoptimalaf2.py b/eos/effects/shipbonusenergyneutoptimalaf2.py
index 16cff81fac..39609d68be 100644
--- a/eos/effects/shipbonusenergyneutoptimalaf2.py
+++ b/eos/effects/shipbonusenergyneutoptimalaf2.py
@@ -1,3 +1,7 @@
+# shipBonusEnergyNeutOptimalAF2
+#
+# Used by:
+# Ship: Malice
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange", src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipbonusenergyneutoptimaleaf1.py b/eos/effects/shipbonusenergyneutoptimaleaf1.py
index 4dc4c6b963..29645d514a 100644
--- a/eos/effects/shipbonusenergyneutoptimaleaf1.py
+++ b/eos/effects/shipbonusenergyneutoptimaleaf1.py
@@ -1,3 +1,7 @@
+# shipBonusEnergyNeutOptimalEAF1
+#
+# Used by:
+# Ship: Sentinel
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange", src.getModifiedItemAttr("eliteBonusElectronicAttackShip1"), skill="Electronic Attack Ships")
diff --git a/eos/effects/shipbonusenergyneutoptimalrs1.py b/eos/effects/shipbonusenergyneutoptimalrs1.py
index 6dfeacb3d1..e045b53eb9 100644
--- a/eos/effects/shipbonusenergyneutoptimalrs1.py
+++ b/eos/effects/shipbonusenergyneutoptimalrs1.py
@@ -1,3 +1,7 @@
+# shipBonusEnergyNeutOptimalRS1
+#
+# Used by:
+# Ship: Curse
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange", src.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
diff --git a/eos/effects/shipbonusenergyneutoptimalrs3.py b/eos/effects/shipbonusenergyneutoptimalrs3.py
index 3e3fa70fbc..e71d9d93df 100644
--- a/eos/effects/shipbonusenergyneutoptimalrs3.py
+++ b/eos/effects/shipbonusenergyneutoptimalrs3.py
@@ -1,3 +1,7 @@
+# shipBonusEnergyNeutOptimalRS3
+#
+# Used by:
+# Ship: Pilgrim
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange", src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/shipbonusenergyneutrangeab2.py b/eos/effects/shipbonusenergyneutrangeab2.py
deleted file mode 100644
index b0602ef119..0000000000
--- a/eos/effects/shipbonusenergyneutrangeab2.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# shipBonusEnergyNeutRangeAB2
-#
-# Used by:
-# Ship: Armageddon
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyDestabilizationRange", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")
diff --git a/eos/effects/shipbonusenergyneutrangead2.py b/eos/effects/shipbonusenergyneutrangead2.py
deleted file mode 100644
index 3357d9ed73..0000000000
--- a/eos/effects/shipbonusenergyneutrangead2.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# shipBonusEnergyNeutRangeAD2
-#
-# Used by:
-# Ship: Dragoon
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyDestabilizationRange", ship.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
diff --git a/eos/effects/shipbonusenergynosfalloffab.py b/eos/effects/shipbonusenergynosfalloffab.py
index e6451ce3dd..ddb664d92b 100644
--- a/eos/effects/shipbonusenergynosfalloffab.py
+++ b/eos/effects/shipbonusenergynosfalloffab.py
@@ -1,3 +1,7 @@
+# shipBonusEnergyNosFalloffAB
+#
+# Used by:
+# Ship: Armageddon
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/shipbonusenergynosfalloffab2.py b/eos/effects/shipbonusenergynosfalloffab2.py
index 07f933f175..4fd3d877e1 100644
--- a/eos/effects/shipbonusenergynosfalloffab2.py
+++ b/eos/effects/shipbonusenergynosfalloffab2.py
@@ -1,3 +1,7 @@
+# shipBonusEnergyNosFalloffAB2
+#
+# Used by:
+# Ship: Armageddon
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")
diff --git a/eos/effects/shipbonusenergynosfalloffac3.py b/eos/effects/shipbonusenergynosfalloffac3.py
index ba25c69505..e2099faf45 100644
--- a/eos/effects/shipbonusenergynosfalloffac3.py
+++ b/eos/effects/shipbonusenergynosfalloffac3.py
@@ -1,3 +1,7 @@
+# shipBonusEnergyNosFalloffAC3
+#
+# Used by:
+# Ship: Vangel
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("shipBonusAC3"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipbonusenergynosfalloffad1.py b/eos/effects/shipbonusenergynosfalloffad1.py
index 61cc33227f..466f0f5873 100644
--- a/eos/effects/shipbonusenergynosfalloffad1.py
+++ b/eos/effects/shipbonusenergynosfalloffad1.py
@@ -1,3 +1,7 @@
+# shipBonusEnergyNosFalloffAD1
+#
+# Used by:
+# Ship: Dragoon
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
diff --git a/eos/effects/shipbonusenergynosfalloffaf3.py b/eos/effects/shipbonusenergynosfalloffaf3.py
index 486ac7b727..30837fc681 100644
--- a/eos/effects/shipbonusenergynosfalloffaf3.py
+++ b/eos/effects/shipbonusenergynosfalloffaf3.py
@@ -1,3 +1,7 @@
+# shipBonusEnergyNosFalloffAF3
+#
+# Used by:
+# Ship: Malice
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("shipBonus3AF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipbonusenergynosfalloffeaf3.py b/eos/effects/shipbonusenergynosfalloffeaf3.py
index c7816bb0f7..fddede98ed 100644
--- a/eos/effects/shipbonusenergynosfalloffeaf3.py
+++ b/eos/effects/shipbonusenergynosfalloffeaf3.py
@@ -1,3 +1,7 @@
+# shipBonusEnergyNosFalloffEAF3
+#
+# Used by:
+# Ship: Sentinel
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("eliteBonusElectronicAttackShip3"), skill="Electronic Attack Ships")
diff --git a/eos/effects/shipbonusenergynosfalloffrs2.py b/eos/effects/shipbonusenergynosfalloffrs2.py
index 274a91ada4..448e9f26e1 100644
--- a/eos/effects/shipbonusenergynosfalloffrs2.py
+++ b/eos/effects/shipbonusenergynosfalloffrs2.py
@@ -1,3 +1,7 @@
+# shipBonusEnergyNosFalloffRS2
+#
+# Used by:
+# Ship: Pilgrim
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")
diff --git a/eos/effects/shipbonusenergynosfalloffrs3.py b/eos/effects/shipbonusenergynosfalloffrs3.py
index 4feecd7aca..2cc7313b96 100644
--- a/eos/effects/shipbonusenergynosfalloffrs3.py
+++ b/eos/effects/shipbonusenergynosfalloffrs3.py
@@ -1,3 +1,7 @@
+# shipBonusEnergyNosFalloffRS3
+#
+# Used by:
+# Ship: Curse
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/shipbonusenergynosoptimalac1.py b/eos/effects/shipbonusenergynosoptimalac1.py
index ecb8b72229..ce1d7d17e5 100644
--- a/eos/effects/shipbonusenergynosoptimalac1.py
+++ b/eos/effects/shipbonusenergynosoptimalac1.py
@@ -1,3 +1,7 @@
+# shipBonusEnergyNosOptimalAC1
+#
+# Used by:
+# Ship: Vangel
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange", src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipbonusenergynosoptimalad2.py b/eos/effects/shipbonusenergynosoptimalad2.py
index 7112f90fad..a21ba98b9d 100644
--- a/eos/effects/shipbonusenergynosoptimalad2.py
+++ b/eos/effects/shipbonusenergynosoptimalad2.py
@@ -1,3 +1,7 @@
+# shipBonusEnergyNosOptimalAD2
+#
+# Used by:
+# Ship: Dragoon
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange", src.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
diff --git a/eos/effects/shipbonusenergynosoptimalaf2.py b/eos/effects/shipbonusenergynosoptimalaf2.py
index 113bb33dce..c7b5ca6365 100644
--- a/eos/effects/shipbonusenergynosoptimalaf2.py
+++ b/eos/effects/shipbonusenergynosoptimalaf2.py
@@ -1,3 +1,7 @@
+# shipBonusEnergyNosOptimalAF2
+#
+# Used by:
+# Ship: Malice
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange", src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipbonusenergynosoptimaleaf1.py b/eos/effects/shipbonusenergynosoptimaleaf1.py
index 8efe12a2f9..2874e596ea 100644
--- a/eos/effects/shipbonusenergynosoptimaleaf1.py
+++ b/eos/effects/shipbonusenergynosoptimaleaf1.py
@@ -1,3 +1,7 @@
+# shipBonusEnergyNosOptimalEAF1
+#
+# Used by:
+# Ship: Sentinel
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange", src.getModifiedItemAttr("eliteBonusElectronicAttackShip1"), skill="Electronic Attack Ships")
diff --git a/eos/effects/shipbonusenergynosoptimalrs1.py b/eos/effects/shipbonusenergynosoptimalrs1.py
index 7a7cb4bd65..9755223eda 100644
--- a/eos/effects/shipbonusenergynosoptimalrs1.py
+++ b/eos/effects/shipbonusenergynosoptimalrs1.py
@@ -1,3 +1,7 @@
+# shipBonusEnergyNosOptimalRS1
+#
+# Used by:
+# Ship: Curse
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange", src.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
diff --git a/eos/effects/shipbonusenergynosoptimalrs3.py b/eos/effects/shipbonusenergynosoptimalrs3.py
index 6d24848fe9..8f9da2fcff 100644
--- a/eos/effects/shipbonusenergynosoptimalrs3.py
+++ b/eos/effects/shipbonusenergynosoptimalrs3.py
@@ -1,3 +1,7 @@
+# shipBonusEnergyNosOptimalRS3
+#
+# Used by:
+# Ship: Pilgrim
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange", src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/shipbonusenergyvampirerangeab2.py b/eos/effects/shipbonusenergyvampirerangeab2.py
deleted file mode 100644
index 66e1ae9264..0000000000
--- a/eos/effects/shipbonusenergyvampirerangeab2.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# shipBonusEnergyVampireRangeAB2
-#
-# Used by:
-# Ship: Armageddon
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "powerTransferRange", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")
diff --git a/eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusgf2.py b/eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusgf2.py
index 9b48c6bf5a..52021cfd13 100644
--- a/eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusgf2.py
+++ b/eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusgf2.py
@@ -1,7 +1,8 @@
 # shipBonusEwRemoteSensorDampenerMaxTargetRangeBonusGF2
 #
 # Used by:
-# Variations of ship: Maulus (2 of 2)
+# Ship: Keres
+# Ship: Maulus
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Sensor Damper",
diff --git a/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusgf2.py b/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusgf2.py
index 11d937af2e..49f11ecab8 100644
--- a/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusgf2.py
+++ b/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusgf2.py
@@ -1,7 +1,8 @@
 # shipBonusEwRemoteSensorDampenerScanResolutionBonusGF2
 #
 # Used by:
-# Variations of ship: Maulus (2 of 2)
+# Ship: Keres
+# Ship: Maulus
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Sensor Damper",
diff --git a/eos/effects/shipbonusewweapondisruptionrangedisruptionbonusac1.py b/eos/effects/shipbonusewweapondisruptionrangedisruptionbonusac1.py
deleted file mode 100644
index 5cb0b2285e..0000000000
--- a/eos/effects/shipbonusewweapondisruptionrangedisruptionbonusac1.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEwWeaponDisruptionRangeDisruptionBonusAC1
-#
-# Used by:
-# Variations of ship: Arbitrator (3 of 3)
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
-                                  "maxRangeBonus", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
-                                  "falloffBonus", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipbonusewweapondisruptionrangedisruptionbonusaf2.py b/eos/effects/shipbonusewweapondisruptionrangedisruptionbonusaf2.py
deleted file mode 100644
index f72ad1a0db..0000000000
--- a/eos/effects/shipbonusewweapondisruptionrangedisruptionbonusaf2.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEwWeaponDisruptionRangeDisruptionBonusAF2
-#
-# Used by:
-# Variations of ship: Crucifier (2 of 2)
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
-                                  "maxRangeBonus", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
-                                  "falloffBonus", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipbonusewweapondisruptionstrengthac1.py b/eos/effects/shipbonusewweapondisruptionstrengthac1.py
index 5a947e8e43..5d8b490e75 100644
--- a/eos/effects/shipbonusewweapondisruptionstrengthac1.py
+++ b/eos/effects/shipbonusewweapondisruptionstrengthac1.py
@@ -1,3 +1,7 @@
+# shipBonusEwWeaponDisruptionStrengthAC1
+#
+# Used by:
+# Variations of ship: Arbitrator (3 of 3)
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "missileVelocityBonus", src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipbonusewweapondisruptionstrengthaf2.py b/eos/effects/shipbonusewweapondisruptionstrengthaf2.py
index 2cf85e9878..61a417430a 100644
--- a/eos/effects/shipbonusewweapondisruptionstrengthaf2.py
+++ b/eos/effects/shipbonusewweapondisruptionstrengthaf2.py
@@ -1,3 +1,7 @@
+# shipBonusEwWeaponDisruptionStrengthAF2
+#
+# Used by:
+# Variations of ship: Crucifier (3 of 3)
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "trackingSpeedBonus", src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusac1.py b/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusac1.py
deleted file mode 100644
index 768f7cd62b..0000000000
--- a/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusac1.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# shipBonusEwWeaponDisruptionTrackingSpeedBonusAC1
-#
-# Used by:
-# Variations of ship: Arbitrator (3 of 3)
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor",
-                                  "trackingSpeedBonus", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusaf2.py b/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusaf2.py
deleted file mode 100644
index cc6eb07cb3..0000000000
--- a/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusaf2.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# shipBonusEwWeaponDisruptionTrackingSpeedBonusAF2
-#
-# Used by:
-# Variations of ship: Crucifier (2 of 2)
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
-                                  "trackingSpeedBonus", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusrookie.py b/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusrookie.py
deleted file mode 100644
index b5ce0be095..0000000000
--- a/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusrookie.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# shipBonusEwWeaponDisruptionTrackingSpeedBonusRookie
-#
-# Used by:
-# Ship: Impairor
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor",
-                                  "trackingSpeedBonus", ship.getModifiedItemAttr("rookieWeaponDisruptionBonus"))
diff --git a/eos/effects/shipbonusexplosivearmorresistancead2.py b/eos/effects/shipbonusexplosivearmorresistancead2.py
index 8190af8e05..b9cf16401e 100644
--- a/eos/effects/shipbonusexplosivearmorresistancead2.py
+++ b/eos/effects/shipbonusexplosivearmorresistancead2.py
@@ -1,3 +1,7 @@
+# shipBonusExplosiveArmorResistanceAD2
+#
+# Used by:
+# Ship: Pontifex
 type = "passive"
 def handler(fit, src, context):
     fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
diff --git a/eos/effects/shipbonusexplosivearmorresistancegd2.py b/eos/effects/shipbonusexplosivearmorresistancegd2.py
index b2427a8913..9954b848b2 100644
--- a/eos/effects/shipbonusexplosivearmorresistancegd2.py
+++ b/eos/effects/shipbonusexplosivearmorresistancegd2.py
@@ -1,3 +1,7 @@
+# shipBonusExplosiveArmorResistanceGD2
+#
+# Used by:
+# Ship: Magus
 type = "passive"
 def handler(fit, src, context):
     fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusGD2"), skill="Gallente Destroyer")
diff --git a/eos/effects/shipbonusexplosivemissiledamagecd1.py b/eos/effects/shipbonusexplosivemissiledamagecd1.py
index afd5cfa98f..dab14bcd96 100644
--- a/eos/effects/shipbonusexplosivemissiledamagecd1.py
+++ b/eos/effects/shipbonusexplosivemissiledamagecd1.py
@@ -1,3 +1,7 @@
+# shipBonusExplosiveMissileDamageCD1
+#
+# Used by:
+# Ship: Stork
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "explosiveDamage", src.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer")
diff --git a/eos/effects/shipbonusexplosivemissiledmgmd1.py b/eos/effects/shipbonusexplosivemissiledmgmd1.py
index fe780b0088..4b6852d70e 100644
--- a/eos/effects/shipbonusexplosivemissiledmgmd1.py
+++ b/eos/effects/shipbonusexplosivemissiledmgmd1.py
@@ -1,3 +1,7 @@
+# shipBonusExplosiveMissileDmgMD1
+#
+# Used by:
+# Ship: Bifrost
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "explosiveDamage", src.getModifiedItemAttr("shipBonusMD1"), skill="Minmatar Destroyer")
diff --git a/eos/effects/shipbonusexplosiveshieldresistancemd2.py b/eos/effects/shipbonusexplosiveshieldresistancemd2.py
index 09aa7d92a9..3cd1b0b2cd 100644
--- a/eos/effects/shipbonusexplosiveshieldresistancemd2.py
+++ b/eos/effects/shipbonusexplosiveshieldresistancemd2.py
@@ -1,3 +1,7 @@
+# shipBonusExplosiveShieldResistanceMD2
+#
+# Used by:
+# Ship: Bifrost
 type = "passive"
 def handler(fit, src, context):
     fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusMD2"), skill="Minmatar Destroyer")
diff --git a/eos/effects/shipbonusjustscramblerrangegf2.py b/eos/effects/shipbonusjustscramblerrangegf2.py
index 6f84fe9d83..e620633f2a 100644
--- a/eos/effects/shipbonusjustscramblerrangegf2.py
+++ b/eos/effects/shipbonusjustscramblerrangegf2.py
@@ -1,3 +1,7 @@
+# shipBonusJustScramblerRangeGF2
+#
+# Used by:
+# Ship: Maulus Navy Issue
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Navigation"), "maxRange", src.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/shipbonuskineticarmorresistancead2.py b/eos/effects/shipbonuskineticarmorresistancead2.py
index 8c4ddad638..f326f664cf 100644
--- a/eos/effects/shipbonuskineticarmorresistancead2.py
+++ b/eos/effects/shipbonuskineticarmorresistancead2.py
@@ -1,3 +1,7 @@
+# shipBonusKineticArmorResistanceAD2
+#
+# Used by:
+# Ship: Pontifex
 type = "passive"
 def handler(fit, src, context):
     fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
diff --git a/eos/effects/shipbonuskineticarmorresistancegd2.py b/eos/effects/shipbonuskineticarmorresistancegd2.py
index d5f3637afa..fc46a2b171 100644
--- a/eos/effects/shipbonuskineticarmorresistancegd2.py
+++ b/eos/effects/shipbonuskineticarmorresistancegd2.py
@@ -1,3 +1,7 @@
+# shipBonusKineticArmorResistanceGD2
+#
+# Used by:
+# Ship: Magus
 type = "passive"
 def handler(fit, src, context):
     fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("shipBonusGD2"), skill="Gallente Destroyer")
diff --git a/eos/effects/shipbonuskineticmissiledamagecd1.py b/eos/effects/shipbonuskineticmissiledamagecd1.py
index d752e500bd..fccd0aa380 100644
--- a/eos/effects/shipbonuskineticmissiledamagecd1.py
+++ b/eos/effects/shipbonuskineticmissiledamagecd1.py
@@ -1,3 +1,7 @@
+# shipBonusKineticMissileDamageCD1
+#
+# Used by:
+# Ship: Stork
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "kineticDamage", src.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer")
diff --git a/eos/effects/shipbonuskineticmissiledmgmd1.py b/eos/effects/shipbonuskineticmissiledmgmd1.py
index 9a3c444a01..881fa755c1 100644
--- a/eos/effects/shipbonuskineticmissiledmgmd1.py
+++ b/eos/effects/shipbonuskineticmissiledmgmd1.py
@@ -1,3 +1,7 @@
+# shipBonusKineticMissileDmgMD1
+#
+# Used by:
+# Ship: Bifrost
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "kineticDamage", src.getModifiedItemAttr("shipBonusMD1"), skill="Minmatar Destroyer")
diff --git a/eos/effects/shipbonuskineticshieldresistancemd2.py b/eos/effects/shipbonuskineticshieldresistancemd2.py
index 0b5ffa4c0e..fe8ba6db5b 100644
--- a/eos/effects/shipbonuskineticshieldresistancemd2.py
+++ b/eos/effects/shipbonuskineticshieldresistancemd2.py
@@ -1,3 +1,7 @@
+# shipBonusKineticShieldResistanceMD2
+#
+# Used by:
+# Ship: Bifrost
 type = "passive"
 def handler(fit, src, context):
     fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusMD2"), skill="Minmatar Destroyer")
diff --git a/eos/effects/shipbonusremotearmorrepairamount2af.py b/eos/effects/shipbonusremotearmorrepairamount2af.py
index f63032c9ad..dbabc1045a 100644
--- a/eos/effects/shipbonusremotearmorrepairamount2af.py
+++ b/eos/effects/shipbonusremotearmorrepairamount2af.py
@@ -1,6 +1,7 @@
 # shipBonusRemoteArmorRepairAmount2AF
 #
 # Used by:
+# Ship: Deacon
 # Ship: Inquisitor
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipbonusremotearmorrepairamountgf2.py b/eos/effects/shipbonusremotearmorrepairamountgf2.py
index 44c6285a5b..56bb2a1bb7 100644
--- a/eos/effects/shipbonusremotearmorrepairamountgf2.py
+++ b/eos/effects/shipbonusremotearmorrepairamountgf2.py
@@ -1,7 +1,7 @@
 # shipBonusRemoteArmorRepairAmountGF2
 #
 # Used by:
-# Ship: Navitas
+# Variations of ship: Navitas (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer",
diff --git a/eos/effects/shipbonusremotearmorrepaircapneedaf.py b/eos/effects/shipbonusremotearmorrepaircapneedaf.py
index 924fb5e8b7..b79927306f 100644
--- a/eos/effects/shipbonusremotearmorrepaircapneedaf.py
+++ b/eos/effects/shipbonusremotearmorrepaircapneedaf.py
@@ -1,6 +1,7 @@
 # shipBonusRemoteArmorRepairCapNeedAF
 #
 # Used by:
+# Ship: Deacon
 # Ship: Inquisitor
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipbonusremotearmorrepaircapneedgf.py b/eos/effects/shipbonusremotearmorrepaircapneedgf.py
index 6e7bbf8f6c..f081267cf4 100644
--- a/eos/effects/shipbonusremotearmorrepaircapneedgf.py
+++ b/eos/effects/shipbonusremotearmorrepaircapneedgf.py
@@ -1,7 +1,7 @@
 # shipBonusRemoteArmorRepairCapNeedGF
 #
 # Used by:
-# Ship: Navitas
+# Variations of ship: Navitas (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer",
diff --git a/eos/effects/shipbonusshieldemresistancecd2.py b/eos/effects/shipbonusshieldemresistancecd2.py
index 4cf9c3341a..bbae401465 100644
--- a/eos/effects/shipbonusshieldemresistancecd2.py
+++ b/eos/effects/shipbonusshieldemresistancecd2.py
@@ -1,3 +1,7 @@
+# shipBonusShieldEMResistanceCD2
+#
+# Used by:
+# Ship: Stork
 type = "passive"
 def handler(fit, src, context):
     fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer")
diff --git a/eos/effects/shipbonusshieldexplosiveresistancecd2.py b/eos/effects/shipbonusshieldexplosiveresistancecd2.py
index f64499eafd..04f590b5bd 100644
--- a/eos/effects/shipbonusshieldexplosiveresistancecd2.py
+++ b/eos/effects/shipbonusshieldexplosiveresistancecd2.py
@@ -1,3 +1,7 @@
+# shipBonusShieldExplosiveResistanceCD2
+#
+# Used by:
+# Ship: Stork
 type = "passive"
 def handler(fit, src, context):
     fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer")
diff --git a/eos/effects/shipbonusshieldkineticresistancecd2.py b/eos/effects/shipbonusshieldkineticresistancecd2.py
index f2d7551a6a..d48537e8d1 100644
--- a/eos/effects/shipbonusshieldkineticresistancecd2.py
+++ b/eos/effects/shipbonusshieldkineticresistancecd2.py
@@ -1,3 +1,7 @@
+# shipBonusShieldKineticResistanceCD2
+#
+# Used by:
+# Ship: Stork
 type = "passive"
 def handler(fit, src, context):
     fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer")
diff --git a/eos/effects/shipbonusshieldthermalresistancecd2.py b/eos/effects/shipbonusshieldthermalresistancecd2.py
index f4ffeda649..2554e9bcec 100644
--- a/eos/effects/shipbonusshieldthermalresistancecd2.py
+++ b/eos/effects/shipbonusshieldthermalresistancecd2.py
@@ -1,3 +1,7 @@
+# shipBonusShieldThermalResistanceCD2
+#
+# Used by:
+# Ship: Stork
 type = "passive"
 def handler(fit, src, context):
     fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer")
diff --git a/eos/effects/shipbonusshieldtransferboostamountcf2.py b/eos/effects/shipbonusshieldtransferboostamountcf2.py
index 8831ac6e89..601c4ca7fa 100644
--- a/eos/effects/shipbonusshieldtransferboostamountcf2.py
+++ b/eos/effects/shipbonusshieldtransferboostamountcf2.py
@@ -1,7 +1,7 @@
 # shipBonusShieldTransferBoostAmountCF2
 #
 # Used by:
-# Ship: Bantam
+# Variations of ship: Bantam (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
diff --git a/eos/effects/shipbonusshieldtransferboostamountmf2.py b/eos/effects/shipbonusshieldtransferboostamountmf2.py
index aeed31fe22..9cca8c9e09 100644
--- a/eos/effects/shipbonusshieldtransferboostamountmf2.py
+++ b/eos/effects/shipbonusshieldtransferboostamountmf2.py
@@ -1,7 +1,7 @@
 # shipBonusShieldTransferBoostAmountMF2
 #
 # Used by:
-# Ship: Burst
+# Variations of ship: Burst (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
diff --git a/eos/effects/shipbonusshieldtransfercapneedcf.py b/eos/effects/shipbonusshieldtransfercapneedcf.py
index 28fbbf8fbc..6f216c594d 100644
--- a/eos/effects/shipbonusshieldtransfercapneedcf.py
+++ b/eos/effects/shipbonusshieldtransfercapneedcf.py
@@ -1,7 +1,7 @@
 # shipBonusShieldTransferCapNeedCF
 #
 # Used by:
-# Ship: Bantam
+# Variations of ship: Bantam (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
diff --git a/eos/effects/shipbonusshieldtransfercapneedmf.py b/eos/effects/shipbonusshieldtransfercapneedmf.py
index 426c8a834b..9ea17daa44 100644
--- a/eos/effects/shipbonusshieldtransfercapneedmf.py
+++ b/eos/effects/shipbonusshieldtransfercapneedmf.py
@@ -1,7 +1,7 @@
 # shipBonusShieldTransferCapNeedMF
 #
 # Used by:
-# Ship: Burst
+# Variations of ship: Burst (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
diff --git a/eos/effects/shipbonustargetpainteroptimalmf1.py b/eos/effects/shipbonustargetpainteroptimalmf1.py
index f45fe8a1dc..b0dbdc28d3 100644
--- a/eos/effects/shipbonustargetpainteroptimalmf1.py
+++ b/eos/effects/shipbonustargetpainteroptimalmf1.py
@@ -1,7 +1,8 @@
 # shipBonusTargetPainterOptimalMF1
 #
 # Used by:
-# Variations of ship: Vigil (2 of 2)
+# Ship: Hyena
+# Ship: Vigil
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Target Painting"),
diff --git a/eos/effects/shipbonusthermalarmorresistancead2.py b/eos/effects/shipbonusthermalarmorresistancead2.py
index dcadae1c1c..1754775480 100644
--- a/eos/effects/shipbonusthermalarmorresistancead2.py
+++ b/eos/effects/shipbonusthermalarmorresistancead2.py
@@ -1,3 +1,7 @@
+# shipBonusThermalArmorResistanceAD2
+#
+# Used by:
+# Ship: Pontifex
 type = "passive"
 def handler(fit, src, context):
     fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
diff --git a/eos/effects/shipbonusthermalarmorresistancegd2.py b/eos/effects/shipbonusthermalarmorresistancegd2.py
index 8550ba23a6..aeee7c1efb 100644
--- a/eos/effects/shipbonusthermalarmorresistancegd2.py
+++ b/eos/effects/shipbonusthermalarmorresistancegd2.py
@@ -1,3 +1,7 @@
+# shipBonusThermalArmorResistanceGD2
+#
+# Used by:
+# Ship: Magus
 type = "passive"
 def handler(fit, src, context):
     fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("shipBonusGD2"), skill="Gallente Destroyer")
diff --git a/eos/effects/shipbonusthermalmissiledamagecd1.py b/eos/effects/shipbonusthermalmissiledamagecd1.py
index 63fdd9337b..060decddee 100644
--- a/eos/effects/shipbonusthermalmissiledamagecd1.py
+++ b/eos/effects/shipbonusthermalmissiledamagecd1.py
@@ -1,3 +1,7 @@
+# shipBonusThermalMissileDamageCD1
+#
+# Used by:
+# Ship: Stork
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "thermalDamage", src.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer")
diff --git a/eos/effects/shipbonusthermalshieldresistancemd2.py b/eos/effects/shipbonusthermalshieldresistancemd2.py
index ecb3511910..a7221bc88a 100644
--- a/eos/effects/shipbonusthermalshieldresistancemd2.py
+++ b/eos/effects/shipbonusthermalshieldresistancemd2.py
@@ -1,3 +1,7 @@
+# shipBonusThermalShieldResistanceMD2
+#
+# Used by:
+# Ship: Bifrost
 type = "passive"
 def handler(fit, src, context):
     fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusMD2"), skill="Minmatar Destroyer")
diff --git a/eos/effects/shipbonusthermmissiledmgmd1.py b/eos/effects/shipbonusthermmissiledmgmd1.py
index d7e3866832..5f1d29b7a2 100644
--- a/eos/effects/shipbonusthermmissiledmgmd1.py
+++ b/eos/effects/shipbonusthermmissiledmgmd1.py
@@ -1,3 +1,7 @@
+# shipBonusThermMissileDmgMD1
+#
+# Used by:
+# Ship: Bifrost
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "thermalDamage", src.getModifiedItemAttr("shipBonusMD1"), skill="Minmatar Destroyer")
diff --git a/eos/effects/shipecmscanstrengthbonuscf.py b/eos/effects/shipecmscanstrengthbonuscf.py
index 06735bcb14..544c9854e6 100644
--- a/eos/effects/shipecmscanstrengthbonuscf.py
+++ b/eos/effects/shipecmscanstrengthbonuscf.py
@@ -1,7 +1,7 @@
 # shipECMScanStrengthBonusCF
 #
 # Used by:
-# Variations of ship: Griffin (2 of 2)
+# Variations of ship: Griffin (3 of 3)
 type = "passive"
 def handler(fit, ship, context):
     for type in ("Gravimetric", "Ladar", "Radar", "Magnetometric"):
diff --git a/eos/effects/shipenergyneutralizerrangebonusac.py b/eos/effects/shipenergyneutralizerrangebonusac.py
deleted file mode 100644
index f4109c4e26..0000000000
--- a/eos/effects/shipenergyneutralizerrangebonusac.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# shipEnergyNeutralizerRangeBonusAC
-#
-# Used by:
-# Ship: Vangel
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyDestabilizationRange", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipenergyneutralizerrangebonusaf2.py b/eos/effects/shipenergyneutralizerrangebonusaf2.py
deleted file mode 100644
index d574dbb131..0000000000
--- a/eos/effects/shipenergyneutralizerrangebonusaf2.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# shipEnergyNeutralizerRangeBonusAF2
-#
-# Used by:
-# Ship: Malice
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyDestabilizationRange", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipenergytcapneedbonusaf.py b/eos/effects/shipenergytcapneedbonusaf.py
index 7050d843f9..b40fa69fb4 100644
--- a/eos/effects/shipenergytcapneedbonusaf.py
+++ b/eos/effects/shipenergytcapneedbonusaf.py
@@ -4,6 +4,7 @@
 # Ship: Crusader
 # Ship: Executioner
 # Ship: Gold Magnate
+# Ship: Punisher
 # Ship: Retribution
 # Ship: Silver Magnate
 # Ship: Tormentor
diff --git a/eos/effects/shipenergyvampirerangebonusfixedac.py b/eos/effects/shipenergyvampirerangebonusfixedac.py
deleted file mode 100644
index b18bc906b0..0000000000
--- a/eos/effects/shipenergyvampirerangebonusfixedac.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# shipEnergyVampireRangeBonusFixedAC
-#
-# Used by:
-# Ship: Vangel
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "powerTransferRange", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipenergyvampirerangebonusfixedaf2.py b/eos/effects/shipenergyvampirerangebonusfixedaf2.py
deleted file mode 100644
index 8a84b1b141..0000000000
--- a/eos/effects/shipenergyvampirerangebonusfixedaf2.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# shipEnergyVampireRangeBonusFixedAF2
-#
-# Used by:
-# Ship: Malice
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "powerTransferRange", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipetdamageaf.py b/eos/effects/shipetdamageaf.py
index 013a926854..4be3ab94cf 100644
--- a/eos/effects/shipetdamageaf.py
+++ b/eos/effects/shipetdamageaf.py
@@ -1,3 +1,9 @@
+# shipETDamageAF
+#
+# Used by:
+# Ship: Crucifier Navy Issue
+# Ship: Crusader
+# Ship: Imperial Navy Slicer
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), "damageMultiplier", src.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/shiphybriddamagebonuscf2.py b/eos/effects/shiphybriddamagebonuscf2.py
index 89354e1972..6a579df624 100644
--- a/eos/effects/shiphybriddamagebonuscf2.py
+++ b/eos/effects/shiphybriddamagebonuscf2.py
@@ -1,6 +1,7 @@
 # shipHybridDamageBonusCF2
 #
 # Used by:
+# Ship: Griffin Navy Issue
 # Ship: Merlin
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipminingbonusorefrig1.py b/eos/effects/shipminingbonusorefrig1.py
index be5c5c9a4a..54a33756c1 100644
--- a/eos/effects/shipminingbonusorefrig1.py
+++ b/eos/effects/shipminingbonusorefrig1.py
@@ -1,7 +1,8 @@
 # shipMiningBonusOREfrig1
 #
 # Used by:
-# Variations of ship: Venture (2 of 2)
+# Ships from group: Expedition Frigate (2 of 2)
+# Ship: Venture
 type = "passive"
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
diff --git a/eos/effects/shipmissileemdamagecf2.py b/eos/effects/shipmissileemdamagecf2.py
index ec0ae1f7ec..0b6ef4a07e 100644
--- a/eos/effects/shipmissileemdamagecf2.py
+++ b/eos/effects/shipmissileemdamagecf2.py
@@ -1,7 +1,6 @@
 # shipMissileEMDamageCF2
 #
 # Used by:
-# Ship: Caldari Navy Hookbill
 # Ship: Garmur
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipmissileexplosivedamagecf2.py b/eos/effects/shipmissileexplosivedamagecf2.py
index df6dad4568..9290e691ff 100644
--- a/eos/effects/shipmissileexplosivedamagecf2.py
+++ b/eos/effects/shipmissileexplosivedamagecf2.py
@@ -1,7 +1,6 @@
 # shipMissileExplosiveDamageCF2
 #
 # Used by:
-# Ship: Caldari Navy Hookbill
 # Ship: Garmur
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipmissilekindamagecc2.py b/eos/effects/shipmissilekindamagecc2.py
index 54b623dd7a..78a95f84e3 100644
--- a/eos/effects/shipmissilekindamagecc2.py
+++ b/eos/effects/shipmissilekindamagecc2.py
@@ -1,7 +1,6 @@
 # shipMissileKinDamageCC2
 #
 # Used by:
-# Ship: Osprey Navy Issue
 # Ship: Rook
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipmissilekindamagecc3.py b/eos/effects/shipmissilekindamagecc3.py
index ec03affec5..e1958c3085 100644
--- a/eos/effects/shipmissilekindamagecc3.py
+++ b/eos/effects/shipmissilekindamagecc3.py
@@ -1,13 +1,7 @@
 # shipMissileKinDamageCC3
-#  Modifier 1:
-#  #  state: offline
-#  #  scope: local
-#  #  srcattr: shipBonusCC3 1535
-#  #  operator: post_percent 8
-#  #  tgtattr: kineticDamage (not penalized) 117
-#  #  location: space
-#  #  filter type: skill
-#  #  filter value: Missile Launcher Operation
+#
+# Used by:
+# Ship: Osprey Navy Issue
 
 type = "passive"
 def handler(fit, src, context):
diff --git a/eos/effects/shipmissilekineticdamagecf.py b/eos/effects/shipmissilekineticdamagecf.py
index 89b625b1ed..665c22f844 100644
--- a/eos/effects/shipmissilekineticdamagecf.py
+++ b/eos/effects/shipmissilekineticdamagecf.py
@@ -2,7 +2,6 @@
 #
 # Used by:
 # Ship: Buzzard
-# Ship: Caldari Navy Hookbill
 # Ship: Condor
 # Ship: Hawk
 type = "passive"
diff --git a/eos/effects/shipmissilelightvelocitybonuscf2.py b/eos/effects/shipmissilelightvelocitybonuscf2.py
deleted file mode 100644
index a94e057c40..0000000000
--- a/eos/effects/shipmissilelightvelocitybonuscf2.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# shipMissileLightVelocityBonusCF2
-#
-# Used by:
-# Ship: Caldari Navy Hookbill
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/shipmissilerocketvelocitybonuscf2.py b/eos/effects/shipmissilerocketvelocitybonuscf2.py
deleted file mode 100644
index a51d7c5ebf..0000000000
--- a/eos/effects/shipmissilerocketvelocitybonuscf2.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# shipMissileRocketVelocityBonusCF2
-#
-# Used by:
-# Ship: Caldari Navy Hookbill
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/shipmissilethermaldamagecf2.py b/eos/effects/shipmissilethermaldamagecf2.py
index 60480c2e80..80af650d9f 100644
--- a/eos/effects/shipmissilethermaldamagecf2.py
+++ b/eos/effects/shipmissilethermaldamagecf2.py
@@ -1,7 +1,6 @@
 # shipMissileThermalDamageCF2
 #
 # Used by:
-# Ship: Caldari Navy Hookbill
 # Ship: Garmur
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipmissilevelocitycf.py b/eos/effects/shipmissilevelocitycf.py
index 33ec0887f6..3bb7fe4c62 100644
--- a/eos/effects/shipmissilevelocitycf.py
+++ b/eos/effects/shipmissilevelocitycf.py
@@ -1,6 +1,7 @@
 # shipMissileVelocityCF
 #
 # Used by:
+# Ship: Caldari Navy Hookbill
 # Ship: Crow
 # Ship: Kestrel
 type = "passive"
diff --git a/eos/effects/shipremotearmorfalloffac2.py b/eos/effects/shipremotearmorfalloffac2.py
index 7cdc7392f3..4194a0eee5 100644
--- a/eos/effects/shipremotearmorfalloffac2.py
+++ b/eos/effects/shipremotearmorfalloffac2.py
@@ -1,3 +1,7 @@
+# shipRemoteArmorFalloffAC2
+#
+# Used by:
+# Ship: Guardian
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "falloffEffectiveness", src.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipremotearmorfalloffgc1.py b/eos/effects/shipremotearmorfalloffgc1.py
index 031fc202e9..03a5b8b3c2 100644
--- a/eos/effects/shipremotearmorfalloffgc1.py
+++ b/eos/effects/shipremotearmorfalloffgc1.py
@@ -1,3 +1,7 @@
+# shipRemoteArmorFalloffGC1
+#
+# Used by:
+# Ship: Oneiros
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "falloffEffectiveness", src.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipremotearmorrangeac2.py b/eos/effects/shipremotearmorrangeac2.py
index 64ca620f67..d06c6912ef 100644
--- a/eos/effects/shipremotearmorrangeac2.py
+++ b/eos/effects/shipremotearmorrangeac2.py
@@ -1,3 +1,7 @@
+# shipRemoteArmorRangeAC2
+#
+# Used by:
+# Ship: Guardian
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "maxRange", src.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipremotearmorrangegc1.py b/eos/effects/shipremotearmorrangegc1.py
index 7cf0a6cf96..718c4503b9 100644
--- a/eos/effects/shipremotearmorrangegc1.py
+++ b/eos/effects/shipremotearmorrangegc1.py
@@ -1,3 +1,7 @@
+# shipRemoteArmorRangeGC1
+#
+# Used by:
+# Ship: Oneiros
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "maxRange", src.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipremotesensordampenercapneedgf.py b/eos/effects/shipremotesensordampenercapneedgf.py
index ee23bcadb7..0b496f32f4 100644
--- a/eos/effects/shipremotesensordampenercapneedgf.py
+++ b/eos/effects/shipremotesensordampenercapneedgf.py
@@ -1,7 +1,8 @@
 # shipRemoteSensorDampenerCapNeedGF
 #
 # Used by:
-# Variations of ship: Maulus (2 of 2)
+# Ship: Keres
+# Ship: Maulus
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Sensor Damper",
diff --git a/eos/effects/shiprocketemthermkindmgmf2.py b/eos/effects/shiprocketemthermkindmgmf2.py
index 8d3e25cbd4..f5a3e3f79a 100644
--- a/eos/effects/shiprocketemthermkindmgmf2.py
+++ b/eos/effects/shiprocketemthermkindmgmf2.py
@@ -1,3 +1,7 @@
+# shipRocketEMThermKinDmgMF2
+#
+# Used by:
+# Ship: Vigil Fleet Issue
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "emDamage", src.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
diff --git a/eos/effects/shiprocketexpdmgmf3.py b/eos/effects/shiprocketexpdmgmf3.py
index f94d45fbc8..2ba97c41d4 100644
--- a/eos/effects/shiprocketexpdmgmf3.py
+++ b/eos/effects/shiprocketexpdmgmf3.py
@@ -1,3 +1,7 @@
+# shipRocketExpDmgMF3
+#
+# Used by:
+# Ship: Vigil Fleet Issue
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "explosiveDamage", src.getModifiedItemAttr("shipBonus3MF"), skill="Minmatar Frigate")
diff --git a/eos/effects/shipsetdmgbonus2af.py b/eos/effects/shipsetdmgbonus2af.py
deleted file mode 100644
index ae0159b625..0000000000
--- a/eos/effects/shipsetdmgbonus2af.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# shipSETDmgBonus2AF
-#
-# Used by:
-# Ship: Punisher
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipshieldtransferfalloffcc1.py b/eos/effects/shipshieldtransferfalloffcc1.py
index 8f2d5aa02f..515f25bd25 100644
--- a/eos/effects/shipshieldtransferfalloffcc1.py
+++ b/eos/effects/shipshieldtransferfalloffcc1.py
@@ -1,3 +1,8 @@
+# shipShieldTransferFalloffCC1
+#
+# Used by:
+# Ship: Basilisk
+# Ship: Etana
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "falloffEffectiveness", src.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/shipshieldtransferfalloffmc2.py b/eos/effects/shipshieldtransferfalloffmc2.py
index 7e9695af76..5f5afb211d 100644
--- a/eos/effects/shipshieldtransferfalloffmc2.py
+++ b/eos/effects/shipshieldtransferfalloffmc2.py
@@ -1,3 +1,7 @@
+# shipShieldTransferFalloffMC2
+#
+# Used by:
+# Ship: Scimitar
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "falloffEffectiveness", src.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/shipshieldtransferrangecc1.py b/eos/effects/shipshieldtransferrangecc1.py
index d62db2ff07..e3db5f4d72 100644
--- a/eos/effects/shipshieldtransferrangecc1.py
+++ b/eos/effects/shipshieldtransferrangecc1.py
@@ -1,3 +1,8 @@
+# shipShieldTransferRangeCC1
+#
+# Used by:
+# Ship: Basilisk
+# Ship: Etana
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "maxRange", src.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/shipshieldtransferrangemc2.py b/eos/effects/shipshieldtransferrangemc2.py
index 2eedca3db4..95af8e1577 100644
--- a/eos/effects/shipshieldtransferrangemc2.py
+++ b/eos/effects/shipshieldtransferrangemc2.py
@@ -1,3 +1,7 @@
+# shipShieldTransferRangeMC2
+#
+# Used by:
+# Ship: Scimitar
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "maxRange", src.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/shipsmallmissileemdmgcf2.py b/eos/effects/shipsmallmissileemdmgcf2.py
index 224482c503..0e8db486af 100644
--- a/eos/effects/shipsmallmissileemdmgcf2.py
+++ b/eos/effects/shipsmallmissileemdmgcf2.py
@@ -1,6 +1,7 @@
 # shipSmallMissileEMDmgCF2
 #
 # Used by:
+# Ship: Caldari Navy Hookbill
 # Ship: Kestrel
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipsmallmissileexpdmgcf2.py b/eos/effects/shipsmallmissileexpdmgcf2.py
index 8fb0c32f3b..4a79cab545 100644
--- a/eos/effects/shipsmallmissileexpdmgcf2.py
+++ b/eos/effects/shipsmallmissileexpdmgcf2.py
@@ -1,6 +1,7 @@
 # shipSmallMissileExpDmgCF2
 #
 # Used by:
+# Ship: Caldari Navy Hookbill
 # Ship: Kestrel
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipsmallmissilekindmgcf3.py b/eos/effects/shipsmallmissilekindmgcf3.py
index c6128917f2..3e8ea0e3a4 100644
--- a/eos/effects/shipsmallmissilekindmgcf3.py
+++ b/eos/effects/shipsmallmissilekindmgcf3.py
@@ -1,22 +1,7 @@
 # shipSmallMissileKinDmgCF3
-#  Modifier 1:
-#  #  state: offline
-#  #  scope: local
-#  #  srcattr: shipBonus3CF 1624
-#  #  operator: post_percent 8
-#  #  tgtattr: kineticDamage (not penalized) 117
-#  #  location: space
-#  #  filter type: skill
-#  #  filter value: Light Missiles
-#  Modifier 2:
-#  #  state: offline
-#  #  scope: local
-#  #  srcattr: shipBonus3CF 1624
-#  #  operator: post_percent 8
-#  #  tgtattr: kineticDamage (not penalized) 117
-#  #  location: space
-#  #  filter type: skill
-#  #  filter value: Rockets
+#
+# Used by:
+# Ship: Caldari Navy Hookbill
 
 type = "passive"
 def handler(fit, src, context):
diff --git a/eos/effects/shipsmallmissilethermdmgcf2.py b/eos/effects/shipsmallmissilethermdmgcf2.py
index d768a0adbf..02d5e185e7 100644
--- a/eos/effects/shipsmallmissilethermdmgcf2.py
+++ b/eos/effects/shipsmallmissilethermdmgcf2.py
@@ -1,6 +1,7 @@
 # shipSmallMissileThermDmgCF2
 #
 # Used by:
+# Ship: Caldari Navy Hookbill
 # Ship: Kestrel
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/targetarmorrepair.py b/eos/effects/targetarmorrepair.py
index f14983704f..7adf280c9a 100644
--- a/eos/effects/targetarmorrepair.py
+++ b/eos/effects/targetarmorrepair.py
@@ -1,7 +1,6 @@
 # targetArmorRepair
 #
 # Used by:
-# Modules from group: Remote Armor Repairer (38 of 38)
 # Drones named like: Armor Maintenance Bot (6 of 6)
 # Module: QA Remote Armor Repair System - 5 Players
 type = "projected", "active"
diff --git a/eos/effects/targetgunnerymaxrangeandtrackingspeedandfalloffbonushostile.py b/eos/effects/targetgunnerymaxrangeandtrackingspeedandfalloffbonushostile.py
index 8d135d2907..fa4092ecbb 100644
--- a/eos/effects/targetgunnerymaxrangeandtrackingspeedandfalloffbonushostile.py
+++ b/eos/effects/targetgunnerymaxrangeandtrackingspeedandfalloffbonushostile.py
@@ -1,7 +1,7 @@
 # targetGunneryMaxRangeAndTrackingSpeedAndFalloffBonusHostile
 #
 # Used by:
-# Modules from group: Tracking Disruptor (8 of 8)
+# Variations of module: Tracking Disruptor I (6 of 6)
 type= "projected", "active"
 def handler(fit, module, context):
     if "projected" in context:
diff --git a/eos/effects/targetmaxtargetrangeandscanresolutionbonushostile.py b/eos/effects/targetmaxtargetrangeandscanresolutionbonushostile.py
index b763976cbe..51457a6c06 100644
--- a/eos/effects/targetmaxtargetrangeandscanresolutionbonushostile.py
+++ b/eos/effects/targetmaxtargetrangeandscanresolutionbonushostile.py
@@ -1,7 +1,7 @@
 # targetMaxTargetRangeAndScanResolutionBonusHostile
 #
 # Used by:
-# Modules from group: Remote Sensor Damper (9 of 9)
+# Modules from group: Remote Sensor Damper (8 of 8)
 type= "projected", "active"
 def handler(fit, module, context):
     if "projected" not in context:
diff --git a/eos/effects/targetmissiledisruptorhostile.py b/eos/effects/targetmissiledisruptorhostile.py
index 489c4d99bd..9a21fdb6a2 100644
--- a/eos/effects/targetmissiledisruptorhostile.py
+++ b/eos/effects/targetmissiledisruptorhostile.py
@@ -1,41 +1,7 @@
 # targetMissileDisruptorHostile
-#  Modifier 1:
-#  #  state: active
-#  #  scope: projected
-#  #  srcattr: explosionDelayBonus 596
-#  #  operator: post_percent 8
-#  #  tgtattr: explosionDelay (penalized) 281
-#  #  location: ship
-#  #  filter type: skill
-#  #  filter value: Missile Launcher Operation
-#  Modifier 2:
-#  #  state: active
-#  #  scope: projected
-#  #  srcattr: aoeVelocityBonus 847
-#  #  operator: post_percent 8
-#  #  tgtattr: aoeVelocity (penalized) 653
-#  #  location: ship
-#  #  filter type: skill
-#  #  filter value: Missile Launcher Operation
-#  Modifier 3:
-#  #  state: active
-#  #  scope: projected
-#  #  srcattr: aoeCloudSizeBonus 848
-#  #  operator: post_percent 8
-#  #  tgtattr: aoeCloudSize (penalized) 654
-#  #  location: ship
-#  #  filter type: skill
-#  #  filter value: Missile Launcher Operation
-#  Modifier 4:
-#  #  state: active
-#  #  scope: projected
-#  #  srcattr: missileVelocityBonus 547
-#  #  operator: post_percent 8
-#  #  tgtattr: maxVelocity (penalized) 37
-#  #  location: ship
-#  #  filter type: skill
-#  #  filter value: Missile Launcher Operation
 #
+# Used by:
+# Variations of module: Guidance Disruptor I (6 of 6)
 type = "active", "projected"
 
 def handler(fit, src, context):
diff --git a/eos/effects/velocitybonusonline.py b/eos/effects/velocitybonusonline.py
index e6727ae857..aa96ff6e4e 100644
--- a/eos/effects/velocitybonusonline.py
+++ b/eos/effects/velocitybonusonline.py
@@ -1,7 +1,7 @@
 # velocityBonusOnline
 #
 # Used by:
-# Modules from group: Entosis Link (2 of 2)
+# Modules from group: Entosis Link (6 of 6)
 # Modules from group: Nanofiber Internal Structure (7 of 7)
 # Modules from group: Overdrive Injector System (7 of 7)
 type = "passive"
diff --git a/eos/effects/warpdisruptsphere.py b/eos/effects/warpdisruptsphere.py
index f973fd83f7..7a1751eca8 100644
--- a/eos/effects/warpdisruptsphere.py
+++ b/eos/effects/warpdisruptsphere.py
@@ -1,7 +1,7 @@
 # warpDisruptSphere
 #
 # Used by:
-# Modules from group: Warp Disrupt Field Generator (2 of 2)
+# Modules from group: Warp Disrupt Field Generator (7 of 7)
 type = "active"
 runTime = "early"
 def handler(fit, module, context):