diff --git a/eos/effects/addtosignatureradius2.py b/eos/effects/addtosignatureradius2.py
index 550357bfc..6c790a925 100644
--- a/eos/effects/addtosignatureradius2.py
+++ b/eos/effects/addtosignatureradius2.py
@@ -2,7 +2,7 @@
 #
 # Used by:
 # Modules from group: Missile Launcher Bomb (2 of 2)
-# Modules from group: Shield Extender (33 of 33)
+# Modules from group: Shield Extender (36 of 36)
 type = "passive"
 
 
diff --git a/eos/effects/ammoinfluencecapneed.py b/eos/effects/ammoinfluencecapneed.py
index 1ab51fc20..587e55cd5 100644
--- a/eos/effects/ammoinfluencecapneed.py
+++ b/eos/effects/ammoinfluencecapneed.py
@@ -1,7 +1,7 @@
 # ammoInfluenceCapNeed
 #
 # Used by:
-# Items from category: Charge (493 of 943)
+# Items from category: Charge (493 of 947)
 type = "passive"
 
 
diff --git a/eos/effects/ammoinfluencerange.py b/eos/effects/ammoinfluencerange.py
index 04570e7f5..4358a6ff9 100644
--- a/eos/effects/ammoinfluencerange.py
+++ b/eos/effects/ammoinfluencerange.py
@@ -1,7 +1,7 @@
 # ammoInfluenceRange
 #
 # Used by:
-# Items from category: Charge (587 of 943)
+# Items from category: Charge (587 of 947)
 type = "passive"
 
 
diff --git a/eos/effects/ammospeedmultiplier.py b/eos/effects/ammospeedmultiplier.py
index ac7ada2ad..2a6c2e4d3 100644
--- a/eos/effects/ammospeedmultiplier.py
+++ b/eos/effects/ammospeedmultiplier.py
@@ -4,6 +4,7 @@
 # Charges from group: Festival Charges (23 of 23)
 # Charges from group: Interdiction Probe (2 of 2)
 # Charges from group: Structure Festival Charges (3 of 3)
+# Special Edition Assetss from group: Festival Charges Expired (2 of 2)
 type = "passive"
 
 
diff --git a/eos/effects/ammotrackingmultiplier.py b/eos/effects/ammotrackingmultiplier.py
index 87d442591..6153af15c 100644
--- a/eos/effects/ammotrackingmultiplier.py
+++ b/eos/effects/ammotrackingmultiplier.py
@@ -1,7 +1,7 @@
 # ammoTrackingMultiplier
 #
 # Used by:
-# Items from category: Charge (182 of 943)
+# Items from category: Charge (182 of 947)
 # Charges from group: Projectile Ammo (128 of 128)
 type = "passive"
 
diff --git a/eos/effects/aoebeaconbioluminescencecloud.py b/eos/effects/aoebeaconbioluminescencecloud.py
index dcbf5a004..fa01e217d 100644
--- a/eos/effects/aoebeaconbioluminescencecloud.py
+++ b/eos/effects/aoebeaconbioluminescencecloud.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# aoe_beacon_bioluminescence_cloud
+#
+# Used by:
+# Celestials named like: Bioluminescence Cloud (3 of 3)
 runTime = "early"
 type = ("projected", "passive", "gang")
 
diff --git a/eos/effects/aoebeaconcausticcloud.py b/eos/effects/aoebeaconcausticcloud.py
index dcbf5a004..f11c9805b 100644
--- a/eos/effects/aoebeaconcausticcloud.py
+++ b/eos/effects/aoebeaconcausticcloud.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# aoe_beacon_caustic_cloud
+#
+# Used by:
+# Celestials named like: Caustic Cloud (3 of 3)
 runTime = "early"
 type = ("projected", "passive", "gang")
 
diff --git a/eos/effects/aoebeaconfilamentcloud.py b/eos/effects/aoebeaconfilamentcloud.py
index dcbf5a004..085114e7c 100644
--- a/eos/effects/aoebeaconfilamentcloud.py
+++ b/eos/effects/aoebeaconfilamentcloud.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# aoe_beacon_filament_cloud
+#
+# Used by:
+# Celestials named like: Filament Cloud (3 of 3)
 runTime = "early"
 type = ("projected", "passive", "gang")
 
diff --git a/eos/effects/armorhpbonusadd.py b/eos/effects/armorhpbonusadd.py
index 591e1cc58..f965b45ae 100644
--- a/eos/effects/armorhpbonusadd.py
+++ b/eos/effects/armorhpbonusadd.py
@@ -1,7 +1,7 @@
 # armorHPBonusAdd
 #
 # Used by:
-# Modules from group: Armor Reinforcer (48 of 48)
+# Modules from group: Armor Reinforcer (51 of 51)
 type = "passive"
 
 
diff --git a/eos/effects/armorreinforcermassadd.py b/eos/effects/armorreinforcermassadd.py
index d61b0224c..e60326892 100644
--- a/eos/effects/armorreinforcermassadd.py
+++ b/eos/effects/armorreinforcermassadd.py
@@ -1,7 +1,7 @@
 # armorReinforcerMassAdd
 #
 # Used by:
-# Modules from group: Armor Reinforcer (48 of 48)
+# Modules from group: Armor Reinforcer (51 of 51)
 type = "passive"
 
 
diff --git a/eos/effects/armorrepair.py b/eos/effects/armorrepair.py
index 8555baec0..d65f26ca5 100644
--- a/eos/effects/armorrepair.py
+++ b/eos/effects/armorrepair.py
@@ -1,7 +1,7 @@
 # armorRepair
 #
 # Used by:
-# Modules from group: Armor Repair Unit (105 of 105)
+# Modules from group: Armor Repair Unit (108 of 108)
 runTime = "late"
 type = "active"
 
diff --git a/eos/effects/capacitorcapacitymultiply.py b/eos/effects/capacitorcapacitymultiply.py
index 8b5df217d..91f3e6ed4 100644
--- a/eos/effects/capacitorcapacitymultiply.py
+++ b/eos/effects/capacitorcapacitymultiply.py
@@ -4,7 +4,7 @@
 # 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: Propulsion Module (65 of 127)
+# Modules from group: Propulsion Module (68 of 133)
 # Modules from group: Reactor Control Unit (22 of 22)
 type = "passive"
 
diff --git a/eos/effects/citadelrigbonus.py b/eos/effects/citadelrigbonus.py
index a04c6f479..195835283 100644
--- a/eos/effects/citadelrigbonus.py
+++ b/eos/effects/citadelrigbonus.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# citadelRigBonus
+#
+# Used by:
+# Structures from group: Citadel (9 of 9)
 type = "passive"
 runTime = "early"
 
diff --git a/eos/effects/cpumultiplierpostmulcpuoutputship.py b/eos/effects/cpumultiplierpostmulcpuoutputship.py
index 99f186ce7..99c14306b 100644
--- a/eos/effects/cpumultiplierpostmulcpuoutputship.py
+++ b/eos/effects/cpumultiplierpostmulcpuoutputship.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Modules from group: CPU Enhancer (19 of 19)
+# Variations of structure module: Standup Co-Processor Array I (2 of 2)
 type = "passive"
 
 
diff --git a/eos/effects/doomsdayaoebubble.py b/eos/effects/doomsdayaoebubble.py
index 1eb899ac0..8d79e289d 100644
--- a/eos/effects/doomsdayaoebubble.py
+++ b/eos/effects/doomsdayaoebubble.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Module: Warp Disruption Burst Projector
+# Structure Module: Standup Warp Disruption Burst Projector
 type = "projected", "active"
 
 
diff --git a/eos/effects/doomsdayaoedamp.py b/eos/effects/doomsdayaoedamp.py
index f943c9153..ab55bf185 100644
--- a/eos/effects/doomsdayaoedamp.py
+++ b/eos/effects/doomsdayaoedamp.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Module: Sensor Dampening Burst Projector
+# Structure Module: Standup Sensor Dampening Burst Projector
 type = "projected", "active"
 
 
diff --git a/eos/effects/doomsdayaoeecm.py b/eos/effects/doomsdayaoeecm.py
index 230eb2f16..93d3dd847 100644
--- a/eos/effects/doomsdayaoeecm.py
+++ b/eos/effects/doomsdayaoeecm.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Module: ECM Jammer Burst Projector
+# Structure Module: Standup ECM Jammer Burst Projector
 from eos.modifiedAttributeDict import ModifiedAttributeDict
 
 type = "projected", "active"
diff --git a/eos/effects/doomsdayaoeneut.py b/eos/effects/doomsdayaoeneut.py
index c132a470a..1be85f6bd 100644
--- a/eos/effects/doomsdayaoeneut.py
+++ b/eos/effects/doomsdayaoeneut.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Module: Energy Neutralization Burst Projector
+# Structure Module: Standup Energy Neutralization Burst Projector
 from eos.saveddata.module import State
 from eos.modifiedAttributeDict import ModifiedAttributeDict
 
diff --git a/eos/effects/doomsdayaoepaint.py b/eos/effects/doomsdayaoepaint.py
index b02f68e38..1c039c23c 100644
--- a/eos/effects/doomsdayaoepaint.py
+++ b/eos/effects/doomsdayaoepaint.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Module: Target Illumination Burst Projector
+# Structure Module: Standup Target Illumination Burst Projector
 type = "projected", "active"
 
 
diff --git a/eos/effects/doomsdayaoetrack.py b/eos/effects/doomsdayaoetrack.py
index 910ec7ae5..5ee1f31c9 100644
--- a/eos/effects/doomsdayaoetrack.py
+++ b/eos/effects/doomsdayaoetrack.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Module: Weapon Disruption Burst Projector
+# Structure Module: Standup Weapon Disruption Burst Projector
 
 type = "active", "projected"
 
diff --git a/eos/effects/doomsdayaoeweb.py b/eos/effects/doomsdayaoeweb.py
index 913288b93..eb143b14b 100644
--- a/eos/effects/doomsdayaoeweb.py
+++ b/eos/effects/doomsdayaoeweb.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Module: Stasis Webification Burst Projector
+# Structure Module: Standup Stasis Webification Burst Projector
 type = "active", "projected"
 
 
diff --git a/eos/effects/energyneutralizerfalloff.py b/eos/effects/energyneutralizerfalloff.py
index 37d829baa..67e55e7ad 100644
--- a/eos/effects/energyneutralizerfalloff.py
+++ b/eos/effects/energyneutralizerfalloff.py
@@ -1,7 +1,7 @@
 # energyNeutralizerFalloff
 #
 # Used by:
-# Modules from group: Energy Neutralizer (51 of 51)
+# Modules from group: Energy Neutralizer (54 of 54)
 from eos.saveddata.module import State
 from eos.modifiedAttributeDict import ModifiedAttributeDict
 
diff --git a/eos/effects/fighterabilityattackm.py b/eos/effects/fighterabilityattackm.py
index 2ea002819..d0a028f48 100644
--- a/eos/effects/fighterabilityattackm.py
+++ b/eos/effects/fighterabilityattackm.py
@@ -1,4 +1,8 @@
-# Not used by any item
+# fighterAbilityAttackM
+#
+# Used by:
+# Items from category: Fighter (50 of 82)
+# Fighters from group: Heavy Fighter (34 of 34)
 """
 Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
 effects, and thus this effect file contains some custom information useful only to fighters.
diff --git a/eos/effects/fighterabilityecm.py b/eos/effects/fighterabilityecm.py
index e821c748a..cfc9c21db 100644
--- a/eos/effects/fighterabilityecm.py
+++ b/eos/effects/fighterabilityecm.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# fighterAbilityECM
+#
+# Used by:
+# Fighters named like: Scarab (4 of 4)
 """
 Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
 effects, and thus this effect file contains some custom information useful only to fighters.
diff --git a/eos/effects/fighterabilityenergyneutralizer.py b/eos/effects/fighterabilityenergyneutralizer.py
index 8a43dff19..28b68d089 100644
--- a/eos/effects/fighterabilityenergyneutralizer.py
+++ b/eos/effects/fighterabilityenergyneutralizer.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# fighterAbilityEnergyNeutralizer
+#
+# Used by:
+# Fighters named like: Cenobite (4 of 4)
 """
 Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
 effects, and thus this effect file contains some custom information useful only to fighters.
diff --git a/eos/effects/fighterabilityevasivemaneuvers.py b/eos/effects/fighterabilityevasivemaneuvers.py
index bf17edc92..151effaaa 100644
--- a/eos/effects/fighterabilityevasivemaneuvers.py
+++ b/eos/effects/fighterabilityevasivemaneuvers.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# fighterAbilityEvasiveManeuvers
+#
+# Used by:
+# Fighters from group: Light Fighter (16 of 32)
 """
 Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
 effects, and thus this effect file contains some custom information useful only to fighters.
diff --git a/eos/effects/fighterabilitylaunchbomb.py b/eos/effects/fighterabilitylaunchbomb.py
index bd46513bf..03763fd5a 100644
--- a/eos/effects/fighterabilitylaunchbomb.py
+++ b/eos/effects/fighterabilitylaunchbomb.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# fighterAbilityLaunchBomb
+#
+# Used by:
+# Fighters from group: Heavy Fighter (16 of 34)
 """
 Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
 effects, and thus this effect file contains some custom information useful only to fighters.
diff --git a/eos/effects/fighterabilitymicrowarpdrive.py b/eos/effects/fighterabilitymicrowarpdrive.py
index 6dfbae73a..d9cfdbe47 100644
--- a/eos/effects/fighterabilitymicrowarpdrive.py
+++ b/eos/effects/fighterabilitymicrowarpdrive.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# fighterAbilityMicroWarpDrive
+#
+# Used by:
+# Items from category: Fighter (48 of 82)
 """
 Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
 effects, and thus this effect file contains some custom information useful only to fighters.
diff --git a/eos/effects/fighterabilitymissiles.py b/eos/effects/fighterabilitymissiles.py
index 8dc752ee2..c6dde777e 100644
--- a/eos/effects/fighterabilitymissiles.py
+++ b/eos/effects/fighterabilitymissiles.py
@@ -1,4 +1,8 @@
-# Not used by any item
+# fighterAbilityMissiles
+#
+# Used by:
+# Items from category: Fighter (48 of 82)
+# Fighters from group: Light Fighter (32 of 32)
 """
 Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
 effects, and thus this effect file contains some custom information useful only to fighters.
diff --git a/eos/effects/fighterabilitystasiswebifier.py b/eos/effects/fighterabilitystasiswebifier.py
index 1fd6dd96f..640cff4c0 100644
--- a/eos/effects/fighterabilitystasiswebifier.py
+++ b/eos/effects/fighterabilitystasiswebifier.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# fighterAbilityStasisWebifier
+#
+# Used by:
+# Fighters named like: Dromi (4 of 4)
 """
 Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
 effects, and thus this effect file contains some custom information useful only to fighters.
diff --git a/eos/effects/fighterabilitywarpdisruption.py b/eos/effects/fighterabilitywarpdisruption.py
index d362fb33f..e62c34de7 100644
--- a/eos/effects/fighterabilitywarpdisruption.py
+++ b/eos/effects/fighterabilitywarpdisruption.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# fighterAbilityWarpDisruption
+#
+# Used by:
+# Fighters named like: Siren (4 of 4)
 """
 Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
 effects, and thus this effect file contains some custom information useful only to fighters.
diff --git a/eos/effects/fueledarmorrepair.py b/eos/effects/fueledarmorrepair.py
index 875a25cd2..049c799c1 100644
--- a/eos/effects/fueledarmorrepair.py
+++ b/eos/effects/fueledarmorrepair.py
@@ -1,7 +1,7 @@
 # fueledArmorRepair
 #
 # Used by:
-# Modules from group: Ancillary Armor Repairer (4 of 4)
+# Modules from group: Ancillary Armor Repairer (7 of 7)
 runTime = "late"
 type = "active"
 
diff --git a/eos/effects/fueledshieldboosting.py b/eos/effects/fueledshieldboosting.py
index 36db95e2c..0cbbd439c 100644
--- a/eos/effects/fueledshieldboosting.py
+++ b/eos/effects/fueledshieldboosting.py
@@ -1,7 +1,7 @@
 # fueledShieldBoosting
 #
 # Used by:
-# Modules from group: Ancillary Shield Booster (5 of 5)
+# Modules from group: Ancillary Shield Booster (8 of 8)
 runTime = "late"
 type = "active"
 
diff --git a/eos/effects/lightningweapon.py b/eos/effects/lightningweapon.py
index 4f2324035..81987466e 100644
--- a/eos/effects/lightningweapon.py
+++ b/eos/effects/lightningweapon.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# lightningWeapon
+#
+# Used by:
+# Structure Module: Standup Arcing Vorton Projector I
 type = 'active'
 
 
diff --git a/eos/effects/modulebonusafterburner.py b/eos/effects/modulebonusafterburner.py
index c26412bb0..71f4c96b1 100644
--- a/eos/effects/modulebonusafterburner.py
+++ b/eos/effects/modulebonusafterburner.py
@@ -1,7 +1,7 @@
 # moduleBonusAfterburner
 #
 # Used by:
-# Modules from group: Propulsion Module (62 of 127)
+# Modules from group: Propulsion Module (65 of 133)
 type = "active"
 runTime = "late"
 
diff --git a/eos/effects/modulebonusmicrowarpdrive.py b/eos/effects/modulebonusmicrowarpdrive.py
index 75df915ce..70478fa71 100644
--- a/eos/effects/modulebonusmicrowarpdrive.py
+++ b/eos/effects/modulebonusmicrowarpdrive.py
@@ -1,7 +1,7 @@
 # moduleBonusMicrowarpdrive
 #
 # Used by:
-# Modules from group: Propulsion Module (65 of 127)
+# Modules from group: Propulsion Module (68 of 133)
 type = "active"
 runTime = "late"
 
diff --git a/eos/effects/overloadselfarmordamageamountdurationbonus.py b/eos/effects/overloadselfarmordamageamountdurationbonus.py
index 3545e6dab..c7a2a1049 100644
--- a/eos/effects/overloadselfarmordamageamountdurationbonus.py
+++ b/eos/effects/overloadselfarmordamageamountdurationbonus.py
@@ -1,8 +1,8 @@
 # overloadSelfArmorDamageAmountDurationBonus
 #
 # Used by:
-# Modules from group: Ancillary Armor Repairer (4 of 4)
-# Modules from group: Armor Repair Unit (105 of 105)
+# Modules from group: Ancillary Armor Repairer (7 of 7)
+# Modules from group: Armor Repair Unit (108 of 108)
 type = "overheat"
 
 
diff --git a/eos/effects/overloadselfdurationbonus.py b/eos/effects/overloadselfdurationbonus.py
index 356eab98a..498e3a527 100644
--- a/eos/effects/overloadselfdurationbonus.py
+++ b/eos/effects/overloadselfdurationbonus.py
@@ -2,7 +2,7 @@
 #
 # Used by:
 # Modules from group: Capacitor Booster (59 of 59)
-# Modules from group: Energy Neutralizer (51 of 51)
+# Modules from group: Energy Neutralizer (54 of 54)
 # Modules from group: Energy Nosferatu (51 of 51)
 # Modules from group: Hull Repair Unit (25 of 25)
 # Modules from group: Remote Armor Repairer (39 of 39)
diff --git a/eos/effects/overloadselfrangebonus.py b/eos/effects/overloadselfrangebonus.py
index f306a064f..781bf4794 100644
--- a/eos/effects/overloadselfrangebonus.py
+++ b/eos/effects/overloadselfrangebonus.py
@@ -2,8 +2,8 @@
 #
 # Used by:
 # Modules from group: Stasis Grappler (7 of 7)
-# Modules from group: Stasis Web (18 of 18)
-# Modules from group: Warp Scrambler (52 of 53)
+# Modules from group: Stasis Web (19 of 19)
+# Modules from group: Warp Scrambler (54 of 55)
 type = "overheat"
 
 
diff --git a/eos/effects/overloadselfshieldbonusdurationbonus.py b/eos/effects/overloadselfshieldbonusdurationbonus.py
index cc833be68..4706ccbca 100644
--- a/eos/effects/overloadselfshieldbonusdurationbonus.py
+++ b/eos/effects/overloadselfshieldbonusdurationbonus.py
@@ -1,8 +1,8 @@
 # overloadSelfShieldBonusDurationBonus
 #
 # Used by:
-# Modules from group: Ancillary Shield Booster (5 of 5)
-# Modules from group: Shield Booster (93 of 93)
+# Modules from group: Ancillary Shield Booster (8 of 8)
+# Modules from group: Shield Booster (97 of 97)
 type = "overheat"
 
 
diff --git a/eos/effects/overloadselfspeedbonus.py b/eos/effects/overloadselfspeedbonus.py
index c7ee81a90..cc5dbe3f6 100644
--- a/eos/effects/overloadselfspeedbonus.py
+++ b/eos/effects/overloadselfspeedbonus.py
@@ -1,7 +1,7 @@
 # overloadSelfSpeedBonus
 #
 # Used by:
-# Modules from group: Propulsion Module (127 of 127)
+# Modules from group: Propulsion Module (133 of 133)
 type = "overheat"
 
 
diff --git a/eos/effects/pointdefense.py b/eos/effects/pointdefense.py
index 4f2324035..44cf69af7 100644
--- a/eos/effects/pointdefense.py
+++ b/eos/effects/pointdefense.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# pointDefense
+#
+# Used by:
+# Structure Modules from group: Structure Area Denial Module (2 of 2)
 type = 'active'
 
 
diff --git a/eos/effects/poweroutputmultiply.py b/eos/effects/poweroutputmultiply.py
index f4d5eb600..2add2137d 100644
--- a/eos/effects/poweroutputmultiply.py
+++ b/eos/effects/poweroutputmultiply.py
@@ -5,6 +5,7 @@
 # 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)
+# Variations of structure module: Standup Reactor Control Unit I (2 of 2)
 type = "passive"
 
 
diff --git a/eos/effects/remoteecmfalloff.py b/eos/effects/remoteecmfalloff.py
index 409235895..3ab1e4010 100644
--- a/eos/effects/remoteecmfalloff.py
+++ b/eos/effects/remoteecmfalloff.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Modules from group: ECM (39 of 39)
+# Starbases from group: Electronic Warfare Battery (12 of 12)
 from eos.modifiedAttributeDict import ModifiedAttributeDict
 
 type = "projected", "active"
diff --git a/eos/effects/remotesensordampfalloff.py b/eos/effects/remotesensordampfalloff.py
index 81ae5dfa1..cc60e1986 100644
--- a/eos/effects/remotesensordampfalloff.py
+++ b/eos/effects/remotesensordampfalloff.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Modules from group: Sensor Dampener (6 of 6)
+# Starbases from group: Sensor Dampening Battery (3 of 3)
 type = "projected", "active"
 
 
diff --git a/eos/effects/remotewebifierfalloff.py b/eos/effects/remotewebifierfalloff.py
index 4d5bc770c..c50e08141 100644
--- a/eos/effects/remotewebifierfalloff.py
+++ b/eos/effects/remotewebifierfalloff.py
@@ -2,7 +2,8 @@
 #
 # Used by:
 # Modules from group: Stasis Grappler (7 of 7)
-# Modules from group: Stasis Web (18 of 18)
+# Modules from group: Stasis Web (19 of 19)
+# Starbases from group: Stasis Webification Battery (3 of 3)
 type = "active", "projected"
 
 
diff --git a/eos/effects/servicemodulefullpowerhitpointpostassign.py b/eos/effects/servicemodulefullpowerhitpointpostassign.py
index edcb40ae1..7fdc46eff 100644
--- a/eos/effects/servicemodulefullpowerhitpointpostassign.py
+++ b/eos/effects/servicemodulefullpowerhitpointpostassign.py
@@ -1,4 +1,10 @@
-# Not used by any item
+# serviceModuleFullPowerHitpointPostAssign
+#
+# Used by:
+# Structure Modules from group: Structure Citadel Service Module (2 of 2)
+# Structure Modules from group: Structure Engineering Service Module (6 of 6)
+# Structure Modules from group: Structure Resource Processing Service Module (4 of 4)
+# Structure Module: Standup Moon Drill I
 type = "passive"
 runTime = "early"
 
diff --git a/eos/effects/shieldboosting.py b/eos/effects/shieldboosting.py
index 8d8676d0e..808e2f1b0 100644
--- a/eos/effects/shieldboosting.py
+++ b/eos/effects/shieldboosting.py
@@ -1,7 +1,7 @@
 # shieldBoosting
 #
 # Used by:
-# Modules from group: Shield Booster (93 of 93)
+# Modules from group: Shield Booster (97 of 97)
 runTime = "late"
 type = "active"
 
diff --git a/eos/effects/shieldcapacitybonusonline.py b/eos/effects/shieldcapacitybonusonline.py
index 7c4cb037d..cba8f70bb 100644
--- a/eos/effects/shieldcapacitybonusonline.py
+++ b/eos/effects/shieldcapacitybonusonline.py
@@ -1,7 +1,7 @@
 # shieldCapacityBonusOnline
 #
 # Used by:
-# Modules from group: Shield Extender (33 of 33)
+# Modules from group: Shield Extender (36 of 36)
 # Modules from group: Shield Resistance Amplifier (88 of 88)
 type = "passive"
 
diff --git a/eos/effects/shipmaxlockedtargetsbonusaddonline.py b/eos/effects/shipmaxlockedtargetsbonusaddonline.py
index 5e33906ff..f5ab7cb30 100644
--- a/eos/effects/shipmaxlockedtargetsbonusaddonline.py
+++ b/eos/effects/shipmaxlockedtargetsbonusaddonline.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Modules from group: Signal Amplifier (7 of 7)
+# Structure Modules from group: Structure Signal Amplifier (2 of 2)
 type = "passive"
 
 
diff --git a/eos/effects/shipmaxtargetrangebonusonline.py b/eos/effects/shipmaxtargetrangebonusonline.py
index 520230668..fb6a1520a 100644
--- a/eos/effects/shipmaxtargetrangebonusonline.py
+++ b/eos/effects/shipmaxtargetrangebonusonline.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Modules from group: Signal Amplifier (7 of 7)
+# Structure Modules from group: Structure Signal Amplifier (2 of 2)
 type = "passive"
 
 
diff --git a/eos/effects/shipscanresolutionbonusonline.py b/eos/effects/shipscanresolutionbonusonline.py
index 041b72b75..989f097a8 100644
--- a/eos/effects/shipscanresolutionbonusonline.py
+++ b/eos/effects/shipscanresolutionbonusonline.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Modules from group: Signal Amplifier (7 of 7)
+# Structure Modules from group: Structure Signal Amplifier (2 of 2)
 type = "passive"
 
 
diff --git a/eos/effects/structureaoerofrolebonus.py b/eos/effects/structureaoerofrolebonus.py
index 78b3205ab..776f9a2e9 100644
--- a/eos/effects/structureaoerofrolebonus.py
+++ b/eos/effects/structureaoerofrolebonus.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# structureAoERoFRoleBonus
+#
+# Used by:
+# Items from category: Structure (11 of 14)
 type = "passive"
 
 
diff --git a/eos/effects/structurearmorhpmultiply.py b/eos/effects/structurearmorhpmultiply.py
index 1e34232ed..7095c29d5 100644
--- a/eos/effects/structurearmorhpmultiply.py
+++ b/eos/effects/structurearmorhpmultiply.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# structureArmorHPMultiply
+#
+# Used by:
+# Structure Modules from group: Structure Armor Reinforcer (2 of 2)
 type = "passive"
 runTime = "early"
 
diff --git a/eos/effects/structureballisticcontrolsystem.py b/eos/effects/structureballisticcontrolsystem.py
index 8a167b6be..bce3a7a74 100644
--- a/eos/effects/structureballisticcontrolsystem.py
+++ b/eos/effects/structureballisticcontrolsystem.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# structureBallisticControlSystem
+#
+# Used by:
+# Variations of structure module: Standup Ballistic Control System I (2 of 2)
 type = "passive"
 
 
diff --git a/eos/effects/structurecapacitorcapacitybonus.py b/eos/effects/structurecapacitorcapacitybonus.py
index df4384f5b..b0477fe60 100644
--- a/eos/effects/structurecapacitorcapacitybonus.py
+++ b/eos/effects/structurecapacitorcapacitybonus.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# structureCapacitorCapacityBonus
+#
+# Used by:
+# Structure Modules from group: Structure Capacitor Battery (2 of 2)
 type = "passive"
 
 
diff --git a/eos/effects/structureenergyneutralizerfalloff.py b/eos/effects/structureenergyneutralizerfalloff.py
index 02ee9b4f8..78ca57a33 100644
--- a/eos/effects/structureenergyneutralizerfalloff.py
+++ b/eos/effects/structureenergyneutralizerfalloff.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# structureEnergyNeutralizerFalloff
+#
+# Used by:
+# Structure Modules from group: Structure Energy Neutralizer (5 of 5)
 from eos.saveddata.module import State
 
 type = "active", "projected"
diff --git a/eos/effects/structurefullpowerstatehitpointmodifier.py b/eos/effects/structurefullpowerstatehitpointmodifier.py
index 54f9ce7b6..fd60335f7 100644
--- a/eos/effects/structurefullpowerstatehitpointmodifier.py
+++ b/eos/effects/structurefullpowerstatehitpointmodifier.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# structureFullPowerStateHitpointModifier
+#
+# Used by:
+# Items from category: Structure (14 of 14)
 type = "passive"
 
 
diff --git a/eos/effects/structurehiddenarmorhpmultiplier.py b/eos/effects/structurehiddenarmorhpmultiplier.py
index 09e2d31c7..045253880 100644
--- a/eos/effects/structurehiddenarmorhpmultiplier.py
+++ b/eos/effects/structurehiddenarmorhpmultiplier.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# structureHiddenArmorHPMultiplier
+#
+# Used by:
+# Items from category: Structure (14 of 14)
 type = "passive"
 
 
diff --git a/eos/effects/structurehiddenmissiledamagemultiplier.py b/eos/effects/structurehiddenmissiledamagemultiplier.py
index bd8d79366..bf77075ad 100644
--- a/eos/effects/structurehiddenmissiledamagemultiplier.py
+++ b/eos/effects/structurehiddenmissiledamagemultiplier.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# structureHiddenMissileDamageMultiplier
+#
+# Used by:
+# Items from category: Structure (14 of 14)
 type = "passive"
 
 
diff --git a/eos/effects/structuremissileguidanceenhancer.py b/eos/effects/structuremissileguidanceenhancer.py
index 9c0ce2515..59686c5e1 100644
--- a/eos/effects/structuremissileguidanceenhancer.py
+++ b/eos/effects/structuremissileguidanceenhancer.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# structureMissileGuidanceEnhancer
+#
+# Used by:
+# Variations of structure module: Standup Missile Guidance Enhancer I (2 of 2)
 type = "passive"
 
 
diff --git a/eos/effects/structuremodifypowerrechargerate.py b/eos/effects/structuremodifypowerrechargerate.py
index ed8e9c074..f5977b6fe 100644
--- a/eos/effects/structuremodifypowerrechargerate.py
+++ b/eos/effects/structuremodifypowerrechargerate.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# structureModifyPowerRechargeRate
+#
+# Used by:
+# Structure Modules from group: Structure Capacitor Power Relay (2 of 2)
 type = "passive"
 
 
diff --git a/eos/effects/structuremoduleeffectecm.py b/eos/effects/structuremoduleeffectecm.py
index 9a39b452a..a2725fb5e 100644
--- a/eos/effects/structuremoduleeffectecm.py
+++ b/eos/effects/structuremoduleeffectecm.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# structureModuleEffectECM
+#
+# Used by:
+# Structure Modules from group: Structure ECM Battery (3 of 3)
 type = "projected", "active"
 
 
diff --git a/eos/effects/structuremoduleeffectremotesensordampener.py b/eos/effects/structuremoduleeffectremotesensordampener.py
index 08aa61e57..23cd49378 100644
--- a/eos/effects/structuremoduleeffectremotesensordampener.py
+++ b/eos/effects/structuremoduleeffectremotesensordampener.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# structureModuleEffectRemoteSensorDampener
+#
+# Used by:
+# Variations of structure module: Standup Remote Sensor Dampener I (2 of 2)
 
 type = "projected", "active"
 
diff --git a/eos/effects/structuremoduleeffectstasiswebifier.py b/eos/effects/structuremoduleeffectstasiswebifier.py
index aa0b0d553..30040db35 100644
--- a/eos/effects/structuremoduleeffectstasiswebifier.py
+++ b/eos/effects/structuremoduleeffectstasiswebifier.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# structureModuleEffectStasisWebifier
+#
+# Used by:
+# Structure Modules from group: Structure Stasis Webifier (2 of 2)
 type = "active", "projected"
 
 
diff --git a/eos/effects/structuremoduleeffecttargetpainter.py b/eos/effects/structuremoduleeffecttargetpainter.py
index 7c15140e3..d89abe4b3 100644
--- a/eos/effects/structuremoduleeffecttargetpainter.py
+++ b/eos/effects/structuremoduleeffecttargetpainter.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# structureModuleEffectTargetPainter
+#
+# Used by:
+# Variations of structure module: Standup Target Painter I (2 of 2)
 type = "projected", "active"
 
 
diff --git a/eos/effects/structuremoduleeffectweapondisruption.py b/eos/effects/structuremoduleeffectweapondisruption.py
index 3b6365e37..ff3f705ab 100644
--- a/eos/effects/structuremoduleeffectweapondisruption.py
+++ b/eos/effects/structuremoduleeffectweapondisruption.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# structureModuleEffectWeaponDisruption
+#
+# Used by:
+# Variations of structure module: Standup Weapon Disruptor I (2 of 2)
 
 type = "active", "projected"
 
diff --git a/eos/effects/structurerigaoevelocitybonussingletargetmissiles.py b/eos/effects/structurerigaoevelocitybonussingletargetmissiles.py
index 2bf5f4af0..11045a7c2 100644
--- a/eos/effects/structurerigaoevelocitybonussingletargetmissiles.py
+++ b/eos/effects/structurerigaoevelocitybonussingletargetmissiles.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# structureRigAoeVelocityBonusSingleTargetMissiles
+#
+# Used by:
+# Structure Modules named like: Standup Set Missile (6 of 8)
 type = "passive"
 
 
diff --git a/eos/effects/structurerigdoomsdaydamageloss.py b/eos/effects/structurerigdoomsdaydamageloss.py
index e2c6c613b..f81301110 100644
--- a/eos/effects/structurerigdoomsdaydamageloss.py
+++ b/eos/effects/structurerigdoomsdaydamageloss.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# structureRigDoomsdayDamageLoss
+#
+# Used by:
+# Structure Modules from group: Structure Combat Rig XL - Doomsday and Targeting (2 of 2)
 type = "passive"
 
 
diff --git a/eos/effects/structurerigdoomsdaytargetamountbonus.py b/eos/effects/structurerigdoomsdaytargetamountbonus.py
index a68ca1054..ece92271a 100644
--- a/eos/effects/structurerigdoomsdaytargetamountbonus.py
+++ b/eos/effects/structurerigdoomsdaytargetamountbonus.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# structureRigDoomsdayTargetAmountBonus
+#
+# Used by:
+# Structure Modules from group: Structure Combat Rig XL - Doomsday and Targeting (2 of 2)
 type = "passive"
 
 
diff --git a/eos/effects/structurerigewcapacitorneed.py b/eos/effects/structurerigewcapacitorneed.py
index dfeae5753..caaacb6ea 100644
--- a/eos/effects/structurerigewcapacitorneed.py
+++ b/eos/effects/structurerigewcapacitorneed.py
@@ -1,4 +1,8 @@
-# Not used by any item
+# structureRigEWCapacitorNeed
+#
+# Used by:
+# Structure Modules from group: Structure Combat Rig M - EW Cap Reduction (2 of 2)
+# Structure Modules named like: Standup Set EW (4 of 4)
 type = "passive"
 
 
diff --git a/eos/effects/structurerigewmaxrangefalloff.py b/eos/effects/structurerigewmaxrangefalloff.py
index fa6ed13c9..679e4c29e 100644
--- a/eos/effects/structurerigewmaxrangefalloff.py
+++ b/eos/effects/structurerigewmaxrangefalloff.py
@@ -1,4 +1,8 @@
-# Not used by any item
+# structureRigEWMaxRangeFalloff
+#
+# Used by:
+# Structure Modules from group: Structure Combat Rig M - EW projection (2 of 2)
+# Structure Modules named like: Standup Set EW (4 of 4)
 type = "passive"
 
 
diff --git a/eos/effects/structurerigexplosionradiusbonusaoemissiles.py b/eos/effects/structurerigexplosionradiusbonusaoemissiles.py
index 34e840638..a6fedf168 100644
--- a/eos/effects/structurerigexplosionradiusbonusaoemissiles.py
+++ b/eos/effects/structurerigexplosionradiusbonusaoemissiles.py
@@ -1,4 +1,8 @@
-# Not used by any item
+# structureRigExplosionRadiusBonusAoEMissiles
+#
+# Used by:
+# Structure Modules from group: Structure Combat Rig L - AoE Launcher Application and Projection (2 of 2)
+# Structure Modules from group: Structure Combat Rig XL - Missile and AoE Missile (2 of 2)
 type = "passive"
 
 
diff --git a/eos/effects/structurerigmaxtargetrange.py b/eos/effects/structurerigmaxtargetrange.py
index 95fee8a55..52ac17bc8 100644
--- a/eos/effects/structurerigmaxtargetrange.py
+++ b/eos/effects/structurerigmaxtargetrange.py
@@ -1,4 +1,9 @@
-# Not used by any item
+# structureRigMaxTargetRange
+#
+# Used by:
+# Structure Modules from group: Structure Combat Rig L - Max Targets and Sensor Boosting (2 of 2)
+# Structure Modules from group: Structure Combat Rig M - Boosted Sensors (2 of 2)
+# Structure Modules from group: Structure Combat Rig XL - Doomsday and Targeting (2 of 2)
 type = "passive"
 
 
diff --git a/eos/effects/structurerigmaxtargets.py b/eos/effects/structurerigmaxtargets.py
index 47e2ce5d2..452af580d 100644
--- a/eos/effects/structurerigmaxtargets.py
+++ b/eos/effects/structurerigmaxtargets.py
@@ -1,4 +1,8 @@
-# Not used by any item
+# structureRigMaxTargets
+#
+# Used by:
+# Structure Modules from group: Structure Combat Rig XL - Doomsday and Targeting (2 of 2)
+# Structure Modules named like: Standup Set Target (4 of 4)
 type = "passive"
 
 
diff --git a/eos/effects/structurerigneutralizercapacitorneed.py b/eos/effects/structurerigneutralizercapacitorneed.py
index c570161fa..89a2ffec0 100644
--- a/eos/effects/structurerigneutralizercapacitorneed.py
+++ b/eos/effects/structurerigneutralizercapacitorneed.py
@@ -1,4 +1,8 @@
-# Not used by any item
+# structureRigNeutralizerCapacitorNeed
+#
+# Used by:
+# Structure Modules from group: Structure Combat Rig XL - Energy Neutralizer and EW (2 of 2)
+# Structure Modules named like: Standup Set Energy Neutralizer (4 of 6)
 type = "passive"
 
 
diff --git a/eos/effects/structurerigneutralizermaxrangefalloffeffectiveness.py b/eos/effects/structurerigneutralizermaxrangefalloffeffectiveness.py
index d123e0278..55a835155 100644
--- a/eos/effects/structurerigneutralizermaxrangefalloffeffectiveness.py
+++ b/eos/effects/structurerigneutralizermaxrangefalloffeffectiveness.py
@@ -1,4 +1,8 @@
-# Not used by any item
+# structureRigNeutralizerMaxRangeFalloffEffectiveness
+#
+# Used by:
+# Structure Modules from group: Structure Combat Rig XL - Energy Neutralizer and EW (2 of 2)
+# Structure Modules named like: Standup Set Energy Neutralizer (4 of 6)
 type = "passive"
 
 
diff --git a/eos/effects/structurerigpdbcapacitorneed.py b/eos/effects/structurerigpdbcapacitorneed.py
index a32e63ecc..eb1ee6167 100644
--- a/eos/effects/structurerigpdbcapacitorneed.py
+++ b/eos/effects/structurerigpdbcapacitorneed.py
@@ -1,4 +1,8 @@
-# Not used by any item
+# structureRigPDBCapacitorNeed
+#
+# Used by:
+# Structure Modules from group: Structure Combat Rig L - Point Defense Battery Application and Projection (2 of 2)
+# Structure Modules from group: Structure Combat Rig XL - Doomsday and Targeting (2 of 2)
 type = "passive"
 
 
diff --git a/eos/effects/structurerigpdbmaxrange.py b/eos/effects/structurerigpdbmaxrange.py
index 64994bf26..5373add73 100644
--- a/eos/effects/structurerigpdbmaxrange.py
+++ b/eos/effects/structurerigpdbmaxrange.py
@@ -1,4 +1,8 @@
-# Not used by any item
+# structureRigPDBmaxRange
+#
+# Used by:
+# Structure Modules from group: Structure Combat Rig L - Point Defense Battery Application and Projection (2 of 2)
+# Structure Modules from group: Structure Combat Rig XL - Doomsday and Targeting (2 of 2)
 type = "passive"
 
 
diff --git a/eos/effects/structurerigsensorresolution.py b/eos/effects/structurerigsensorresolution.py
index 8d68050e6..26a8ebd58 100644
--- a/eos/effects/structurerigsensorresolution.py
+++ b/eos/effects/structurerigsensorresolution.py
@@ -1,4 +1,9 @@
-# Not used by any item
+# structureRigSensorResolution
+#
+# Used by:
+# Structure Modules from group: Structure Combat Rig L - Max Targets and Sensor Boosting (2 of 2)
+# Structure Modules from group: Structure Combat Rig M - Boosted Sensors (2 of 2)
+# Structure Modules from group: Structure Combat Rig XL - Doomsday and Targeting (2 of 2)
 type = "passive"
 
 
diff --git a/eos/effects/structurerigvelocitybonusaoemissiles.py b/eos/effects/structurerigvelocitybonusaoemissiles.py
index 636134b1f..38985d031 100644
--- a/eos/effects/structurerigvelocitybonusaoemissiles.py
+++ b/eos/effects/structurerigvelocitybonusaoemissiles.py
@@ -1,4 +1,8 @@
-# Not used by any item
+# structureRigVelocityBonusAoeMissiles
+#
+# Used by:
+# Structure Modules from group: Structure Combat Rig L - AoE Launcher Application and Projection (2 of 2)
+# Structure Modules from group: Structure Combat Rig XL - Missile and AoE Missile (2 of 2)
 type = "passive"
 
 
diff --git a/eos/effects/structurerigvelocitybonussingletargetmissiles.py b/eos/effects/structurerigvelocitybonussingletargetmissiles.py
index 929cc7a3e..51103c3a8 100644
--- a/eos/effects/structurerigvelocitybonussingletargetmissiles.py
+++ b/eos/effects/structurerigvelocitybonussingletargetmissiles.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# structureRigVelocityBonusSingleTargetMissiles
+#
+# Used by:
+# Structure Modules named like: Standup Set Missile (6 of 8)
 type = "passive"
 
 
diff --git a/eos/effects/structurewarpscrambleblockmwdwithnpceffect.py b/eos/effects/structurewarpscrambleblockmwdwithnpceffect.py
index aee7b22f9..e6ab9536e 100644
--- a/eos/effects/structurewarpscrambleblockmwdwithnpceffect.py
+++ b/eos/effects/structurewarpscrambleblockmwdwithnpceffect.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# structureWarpScrambleBlockMWDWithNPCEffect
+#
+# Used by:
+# Structure Modules from group: Structure Warp Scrambler (2 of 2)
 from eos.saveddata.module import State
 
 # Not used by any item
diff --git a/eos/effects/tractorbeamcan.py b/eos/effects/tractorbeamcan.py
index 293a839ea..27517bdc0 100644
--- a/eos/effects/tractorbeamcan.py
+++ b/eos/effects/tractorbeamcan.py
@@ -1,6 +1,7 @@
 # tractorBeamCan
 #
 # Used by:
+# Deployables from group: Mobile Tractor Unit (3 of 3)
 # Modules from group: Tractor Beam (4 of 4)
 type = "active"
 
diff --git a/eos/effects/usemissiles.py b/eos/effects/usemissiles.py
index 57a58372b..7376dd563 100644
--- a/eos/effects/usemissiles.py
+++ b/eos/effects/usemissiles.py
@@ -4,6 +4,7 @@
 # Modules from group: Missile Launcher Heavy (12 of 12)
 # Modules from group: Missile Launcher Rocket (15 of 15)
 # Modules named like: Launcher (154 of 154)
+# Structure Modules named like: Standup Launcher (7 of 7)
 type = 'active', "projected"
 
 
diff --git a/eos/effects/warpscramble.py b/eos/effects/warpscramble.py
index 7424625ae..476608626 100644
--- a/eos/effects/warpscramble.py
+++ b/eos/effects/warpscramble.py
@@ -1,7 +1,7 @@
 # warpScramble
 #
 # Used by:
-# Modules named like: Warp Disruptor (27 of 27)
+# Modules named like: Warp Disruptor (28 of 28)
 type = "projected", "active"
 
 
diff --git a/eos/effects/warpscrambleblockmwdwithnpceffect.py b/eos/effects/warpscrambleblockmwdwithnpceffect.py
index 27a82548a..0985d4673 100644
--- a/eos/effects/warpscrambleblockmwdwithnpceffect.py
+++ b/eos/effects/warpscrambleblockmwdwithnpceffect.py
@@ -1,7 +1,7 @@
 # warpScrambleBlockMWDWithNPCEffect
 #
 # Used by:
-# Modules named like: Warp Scrambler (26 of 26)
+# Modules named like: Warp Scrambler (27 of 27)
 from eos.saveddata.module import State
 
 runTime = "early"
diff --git a/eos/effects/weatherbasic.py b/eos/effects/weatherbasic.py
index fac65d882..61b26655c 100644
--- a/eos/effects/weatherbasic.py
+++ b/eos/effects/weatherbasic.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# weather_basic
+#
+# Used by:
+# Celestial: basic_weather
 runTime = "early"
 type = ("projected", "passive")
 
diff --git a/eos/effects/weathercaustictoxin.py b/eos/effects/weathercaustictoxin.py
index dcbf5a004..c13489860 100644
--- a/eos/effects/weathercaustictoxin.py
+++ b/eos/effects/weathercaustictoxin.py
@@ -1,4 +1,9 @@
-# Not used by any item
+# weather_caustic_toxin
+#
+# Used by:
+# Celestial: caustic_toxin_weather_1
+# Celestial: caustic_toxin_weather_2
+# Celestial: caustic_toxin_weather_3
 runTime = "early"
 type = ("projected", "passive", "gang")
 
diff --git a/eos/effects/weatherdarkness.py b/eos/effects/weatherdarkness.py
index dcbf5a004..d1b17d0f8 100644
--- a/eos/effects/weatherdarkness.py
+++ b/eos/effects/weatherdarkness.py
@@ -1,4 +1,9 @@
-# Not used by any item
+# weather_darkness
+#
+# Used by:
+# Celestial: darkness_weather_1
+# Celestial: darkness_weather_2
+# Celestial: darkness_weather_3
 runTime = "early"
 type = ("projected", "passive", "gang")
 
diff --git a/eos/effects/weatherelectricstorm.py b/eos/effects/weatherelectricstorm.py
index dcbf5a004..b6e78935f 100644
--- a/eos/effects/weatherelectricstorm.py
+++ b/eos/effects/weatherelectricstorm.py
@@ -1,4 +1,9 @@
-# Not used by any item
+# weather_electric_storm
+#
+# Used by:
+# Celestial: electric_storm_weather_1
+# Celestial: electric_storm_weather_2
+# Celestial: electric_storm_weather_3
 runTime = "early"
 type = ("projected", "passive", "gang")
 
diff --git a/eos/effects/weatherinfernal.py b/eos/effects/weatherinfernal.py
index dcbf5a004..9ddfe1a30 100644
--- a/eos/effects/weatherinfernal.py
+++ b/eos/effects/weatherinfernal.py
@@ -1,4 +1,9 @@
-# Not used by any item
+# weather_infernal
+#
+# Used by:
+# Celestial: infernal_weather_1
+# Celestial: infernal_weather_2
+# Celestial: infernal_weather_3
 runTime = "early"
 type = ("projected", "passive", "gang")
 
diff --git a/eos/effects/weatherxenongas.py b/eos/effects/weatherxenongas.py
index dcbf5a004..913a7de2b 100644
--- a/eos/effects/weatherxenongas.py
+++ b/eos/effects/weatherxenongas.py
@@ -1,4 +1,9 @@
-# Not used by any item
+# weather_xenon_gas
+#
+# Used by:
+# Celestial: xenon_gas_weather_1
+# Celestial: xenon_gas_weather_2
+# Celestial: xenon_gas_weather_3
 runTime = "early"
 type = ("projected", "passive", "gang")
 
diff --git a/scripts/effectUsedBy.py b/scripts/effectUsedBy.py
index d97038deb..dc231c61c 100755
--- a/scripts/effectUsedBy.py
+++ b/scripts/effectUsedBy.py
@@ -149,10 +149,12 @@ QUERY_ALLEFFECTS = 'SELECT effectID, effectName FROM dgmeffects'
 # Limit categories to Ships (6), Modules (7), Charges (8), Skills (16),
 # Drones (18), Implants (20), Subsystems (32), and groups to
 # Effect Beacons (920)
+# edit - remove the restrictions here - it's a wide open selection of all typeid's
+# didn't want to muck too much with the code, but wanted to get most of the new stuff
+# updated correctly - @blitzmann
 QUERY_PUBLISHEDTYPEIDS = 'SELECT it.typeID FROM invtypes AS it INNER JOIN \
 invgroups AS ig ON it.groupID = ig.groupID INNER JOIN invcategories AS ic ON \
-ig.categoryID = ic.categoryID WHERE it.published = 1 AND (ic.categoryID IN \
-(6, 7, 8, 16, 18, 20, 32) OR ig.groupID = 920)'
+ig.categoryID = ic.categoryID'
 QUERY_TYPEID_GROUPID = 'SELECT groupID FROM invtypes WHERE typeID = ? LIMIT 1'
 QUERY_GROUPID_CATEGORYID = 'SELECT categoryID FROM invgroups WHERE \
 groupID = ? LIMIT 1'