diff --git a/eos/effects/addtosignatureradius2.py b/eos/effects/addtosignatureradius2.py
index 6c790a925..550357bfc 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 (36 of 36)
+# Modules from group: Shield Extender (33 of 33)
 type = "passive"
 
 
diff --git a/eos/effects/ammotrackingmultiplier.py b/eos/effects/ammotrackingmultiplier.py
index 07d95a8d7..87d442591 100644
--- a/eos/effects/ammotrackingmultiplier.py
+++ b/eos/effects/ammotrackingmultiplier.py
@@ -1,13 +1,7 @@
 # ammoTrackingMultiplier
 #
 # Used by:
-# Charges from group: Advanced Artillery Ammo (8 of 8)
-# Charges from group: Advanced Autocannon Ammo (8 of 8)
-# Charges from group: Advanced Beam Laser Crystal (8 of 8)
-# Charges from group: Advanced Blaster Charge (8 of 8)
-# Charges from group: Advanced Charge Bottle (5 of 6)
-# Charges from group: Advanced Pulse Laser Crystal (8 of 8)
-# Charges from group: Advanced Railgun Charge (8 of 8)
+# Items from category: Charge (182 of 943)
 # Charges from group: Projectile Ammo (128 of 128)
 type = "passive"
 
diff --git a/eos/effects/aoebeaconbioluminescencecloud.py b/eos/effects/aoebeaconbioluminescencecloud.py
index 6856fc272..dcbf5a004 100644
--- a/eos/effects/aoebeaconbioluminescencecloud.py
+++ b/eos/effects/aoebeaconbioluminescencecloud.py
@@ -1,3 +1,4 @@
+# Not used by any item
 runTime = "early"
 type = ("projected", "passive", "gang")
 
diff --git a/eos/effects/aoebeaconcausticcloud.py b/eos/effects/aoebeaconcausticcloud.py
index 6856fc272..dcbf5a004 100644
--- a/eos/effects/aoebeaconcausticcloud.py
+++ b/eos/effects/aoebeaconcausticcloud.py
@@ -1,3 +1,4 @@
+# Not used by any item
 runTime = "early"
 type = ("projected", "passive", "gang")
 
diff --git a/eos/effects/aoebeaconfilamentcloud.py b/eos/effects/aoebeaconfilamentcloud.py
index 6856fc272..dcbf5a004 100644
--- a/eos/effects/aoebeaconfilamentcloud.py
+++ b/eos/effects/aoebeaconfilamentcloud.py
@@ -1,3 +1,4 @@
+# Not used by any item
 runTime = "early"
 type = ("projected", "passive", "gang")
 
diff --git a/eos/effects/armorhpbonusadd.py b/eos/effects/armorhpbonusadd.py
index f965b45ae..591e1cc58 100644
--- a/eos/effects/armorhpbonusadd.py
+++ b/eos/effects/armorhpbonusadd.py
@@ -1,7 +1,7 @@
 # armorHPBonusAdd
 #
 # Used by:
-# Modules from group: Armor Reinforcer (51 of 51)
+# Modules from group: Armor Reinforcer (48 of 48)
 type = "passive"
 
 
diff --git a/eos/effects/armorreinforcermassadd.py b/eos/effects/armorreinforcermassadd.py
index e60326892..d61b0224c 100644
--- a/eos/effects/armorreinforcermassadd.py
+++ b/eos/effects/armorreinforcermassadd.py
@@ -1,7 +1,7 @@
 # armorReinforcerMassAdd
 #
 # Used by:
-# Modules from group: Armor Reinforcer (51 of 51)
+# Modules from group: Armor Reinforcer (48 of 48)
 type = "passive"
 
 
diff --git a/eos/effects/armorrepair.py b/eos/effects/armorrepair.py
index d65f26ca5..8555baec0 100644
--- a/eos/effects/armorrepair.py
+++ b/eos/effects/armorrepair.py
@@ -1,7 +1,7 @@
 # armorRepair
 #
 # Used by:
-# Modules from group: Armor Repair Unit (108 of 108)
+# Modules from group: Armor Repair Unit (105 of 105)
 runTime = "late"
 type = "active"
 
diff --git a/eos/effects/capacitorcapacitymultiply.py b/eos/effects/capacitorcapacitymultiply.py
index 91f3e6ed4..8b5df217d 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 (68 of 133)
+# Modules from group: Propulsion Module (65 of 127)
 # Modules from group: Reactor Control Unit (22 of 22)
 type = "passive"
 
diff --git a/eos/effects/disintegratorweapondamagemultiply.py b/eos/effects/disintegratorweapondamagemultiply.py
index b1420e463..a96f6bc3f 100644
--- a/eos/effects/disintegratorweapondamagemultiply.py
+++ b/eos/effects/disintegratorweapondamagemultiply.py
@@ -1,7 +1,7 @@
 # disintegratorWeaponDamageMultiply
 #
 # Used by:
-# Modules from group: Entropic Suppressor (3 of 3)
+# Modules from group: Entropic Radiation Sink (3 of 3)
 type = "passive"
 
 
diff --git a/eos/effects/disintegratorweaponspeedmultiply.py b/eos/effects/disintegratorweaponspeedmultiply.py
index 79d104e08..aa2a9998b 100644
--- a/eos/effects/disintegratorweaponspeedmultiply.py
+++ b/eos/effects/disintegratorweaponspeedmultiply.py
@@ -1,7 +1,7 @@
 # disintegratorWeaponSpeedMultiply
 #
 # Used by:
-# Modules from group: Entropic Suppressor (3 of 3)
+# Modules from group: Entropic Radiation Sink (3 of 3)
 type = "passive"
 
 
diff --git a/eos/effects/energyneutralizerfalloff.py b/eos/effects/energyneutralizerfalloff.py
index 67e55e7ad..37d829baa 100644
--- a/eos/effects/energyneutralizerfalloff.py
+++ b/eos/effects/energyneutralizerfalloff.py
@@ -1,7 +1,7 @@
 # energyNeutralizerFalloff
 #
 # Used by:
-# Modules from group: Energy Neutralizer (54 of 54)
+# Modules from group: Energy Neutralizer (51 of 51)
 from eos.saveddata.module import State
 from eos.modifiedAttributeDict import ModifiedAttributeDict
 
diff --git a/eos/effects/fueledarmorrepair.py b/eos/effects/fueledarmorrepair.py
index 049c799c1..875a25cd2 100644
--- a/eos/effects/fueledarmorrepair.py
+++ b/eos/effects/fueledarmorrepair.py
@@ -1,7 +1,7 @@
 # fueledArmorRepair
 #
 # Used by:
-# Modules from group: Ancillary Armor Repairer (7 of 7)
+# Modules from group: Ancillary Armor Repairer (4 of 4)
 runTime = "late"
 type = "active"
 
diff --git a/eos/effects/fueledshieldboosting.py b/eos/effects/fueledshieldboosting.py
index 0cbbd439c..36db95e2c 100644
--- a/eos/effects/fueledshieldboosting.py
+++ b/eos/effects/fueledshieldboosting.py
@@ -1,7 +1,7 @@
 # fueledShieldBoosting
 #
 # Used by:
-# Modules from group: Ancillary Shield Booster (8 of 8)
+# Modules from group: Ancillary Shield Booster (5 of 5)
 runTime = "late"
 type = "active"
 
diff --git a/eos/effects/modulebonusafterburner.py b/eos/effects/modulebonusafterburner.py
index 71f4c96b1..c26412bb0 100644
--- a/eos/effects/modulebonusafterburner.py
+++ b/eos/effects/modulebonusafterburner.py
@@ -1,7 +1,7 @@
 # moduleBonusAfterburner
 #
 # Used by:
-# Modules from group: Propulsion Module (65 of 133)
+# Modules from group: Propulsion Module (62 of 127)
 type = "active"
 runTime = "late"
 
diff --git a/eos/effects/modulebonusmicrowarpdrive.py b/eos/effects/modulebonusmicrowarpdrive.py
index 70478fa71..75df915ce 100644
--- a/eos/effects/modulebonusmicrowarpdrive.py
+++ b/eos/effects/modulebonusmicrowarpdrive.py
@@ -1,7 +1,7 @@
 # moduleBonusMicrowarpdrive
 #
 # Used by:
-# Modules from group: Propulsion Module (68 of 133)
+# Modules from group: Propulsion Module (65 of 127)
 type = "active"
 runTime = "late"
 
diff --git a/eos/effects/overloadrofbonus.py b/eos/effects/overloadrofbonus.py
index c0d81ca0b..47f64d418 100644
--- a/eos/effects/overloadrofbonus.py
+++ b/eos/effects/overloadrofbonus.py
@@ -2,7 +2,7 @@
 #
 # Used by:
 # Modules from group: Missile Launcher Torpedo (22 of 22)
-# Items from market group: Ship Equipment > Turrets & Bays (429 of 880)
+# Items from market group: Ship Equipment > Turrets & Bays (429 of 881)
 # Module: Interdiction Sphere Launcher I
 type = "overheat"
 
diff --git a/eos/effects/overloadselfarmordamageamountdurationbonus.py b/eos/effects/overloadselfarmordamageamountdurationbonus.py
index c7a2a1049..3545e6dab 100644
--- a/eos/effects/overloadselfarmordamageamountdurationbonus.py
+++ b/eos/effects/overloadselfarmordamageamountdurationbonus.py
@@ -1,8 +1,8 @@
 # overloadSelfArmorDamageAmountDurationBonus
 #
 # Used by:
-# Modules from group: Ancillary Armor Repairer (7 of 7)
-# Modules from group: Armor Repair Unit (108 of 108)
+# Modules from group: Ancillary Armor Repairer (4 of 4)
+# Modules from group: Armor Repair Unit (105 of 105)
 type = "overheat"
 
 
diff --git a/eos/effects/overloadselfdamagebonus.py b/eos/effects/overloadselfdamagebonus.py
index 516932070..073b1ead3 100644
--- a/eos/effects/overloadselfdamagebonus.py
+++ b/eos/effects/overloadselfdamagebonus.py
@@ -3,7 +3,7 @@
 # Used by:
 # Modules from group: Energy Weapon (101 of 214)
 # Modules from group: Hybrid Weapon (105 of 221)
-# Modules from group: Precursor Turret (14 of 14)
+# Modules from group: Precursor Weapon (15 of 15)
 # Modules from group: Projectile Weapon (99 of 165)
 type = "overheat"
 
diff --git a/eos/effects/overloadselfdurationbonus.py b/eos/effects/overloadselfdurationbonus.py
index 498e3a527..356eab98a 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 (54 of 54)
+# Modules from group: Energy Neutralizer (51 of 51)
 # 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 781bf4794..f306a064f 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 (19 of 19)
-# Modules from group: Warp Scrambler (54 of 55)
+# Modules from group: Stasis Web (18 of 18)
+# Modules from group: Warp Scrambler (52 of 53)
 type = "overheat"
 
 
diff --git a/eos/effects/overloadselfshieldbonusdurationbonus.py b/eos/effects/overloadselfshieldbonusdurationbonus.py
index 4706ccbca..cc833be68 100644
--- a/eos/effects/overloadselfshieldbonusdurationbonus.py
+++ b/eos/effects/overloadselfshieldbonusdurationbonus.py
@@ -1,8 +1,8 @@
 # overloadSelfShieldBonusDurationBonus
 #
 # Used by:
-# Modules from group: Ancillary Shield Booster (8 of 8)
-# Modules from group: Shield Booster (97 of 97)
+# Modules from group: Ancillary Shield Booster (5 of 5)
+# Modules from group: Shield Booster (93 of 93)
 type = "overheat"
 
 
diff --git a/eos/effects/overloadselfspeedbonus.py b/eos/effects/overloadselfspeedbonus.py
index cc5dbe3f6..c7ee81a90 100644
--- a/eos/effects/overloadselfspeedbonus.py
+++ b/eos/effects/overloadselfspeedbonus.py
@@ -1,7 +1,7 @@
 # overloadSelfSpeedBonus
 #
 # Used by:
-# Modules from group: Propulsion Module (133 of 133)
+# Modules from group: Propulsion Module (127 of 127)
 type = "overheat"
 
 
diff --git a/eos/effects/remotewebifierfalloff.py b/eos/effects/remotewebifierfalloff.py
index ccf7d88cd..4d5bc770c 100644
--- a/eos/effects/remotewebifierfalloff.py
+++ b/eos/effects/remotewebifierfalloff.py
@@ -2,7 +2,7 @@
 #
 # Used by:
 # Modules from group: Stasis Grappler (7 of 7)
-# Modules from group: Stasis Web (19 of 19)
+# Modules from group: Stasis Web (18 of 18)
 type = "active", "projected"
 
 
diff --git a/eos/effects/shieldboosting.py b/eos/effects/shieldboosting.py
index 808e2f1b0..8d8676d0e 100644
--- a/eos/effects/shieldboosting.py
+++ b/eos/effects/shieldboosting.py
@@ -1,7 +1,7 @@
 # shieldBoosting
 #
 # Used by:
-# Modules from group: Shield Booster (97 of 97)
+# Modules from group: Shield Booster (93 of 93)
 runTime = "late"
 type = "active"
 
diff --git a/eos/effects/shieldcapacitybonusonline.py b/eos/effects/shieldcapacitybonusonline.py
index cba8f70bb..7c4cb037d 100644
--- a/eos/effects/shieldcapacitybonusonline.py
+++ b/eos/effects/shieldcapacitybonusonline.py
@@ -1,7 +1,7 @@
 # shieldCapacityBonusOnline
 #
 # Used by:
-# Modules from group: Shield Extender (36 of 36)
+# Modules from group: Shield Extender (33 of 33)
 # Modules from group: Shield Resistance Amplifier (88 of 88)
 type = "passive"
 
diff --git a/eos/effects/shipbonusneutcapneedrolebonus2.py b/eos/effects/shipbonusneutcapneedrolebonus2.py
new file mode 100644
index 000000000..3e533df0e
--- /dev/null
+++ b/eos/effects/shipbonusneutcapneedrolebonus2.py
@@ -0,0 +1,9 @@
+# shipBonusNeutCapNeedRoleBonus2
+#
+# Used by:
+# Ship: Damavik
+# Ship: Leshak
+# Ship: Vedmak
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "capacitorNeed", src.getModifiedItemAttr("shipBonusRole2"))
diff --git a/eos/effects/shipbonusnosneutcapneedrolebonus2.py b/eos/effects/shipbonusnosneutcapneedrolebonus2.py
index 7988b63b1..fb07c3a2e 100644
--- a/eos/effects/shipbonusnosneutcapneedrolebonus2.py
+++ b/eos/effects/shipbonusnosneutcapneedrolebonus2.py
@@ -1,9 +1,4 @@
-# shipBonusNosNeutCapNeedRoleBonus2
-#
-# Used by:
-# Ship: Damavik
-# Ship: Leshak
-# Ship: Vedmak
+# Not used by any item
 type = "passive"
 
 
diff --git a/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipgroupprecursorturret.py b/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipgroupprecursorturret.py
index d4104befa..f1aaa88e2 100644
--- a/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipgroupprecursorturret.py
+++ b/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipgroupprecursorturret.py
@@ -1,4 +1,4 @@
-# surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipGroupProjectileWeapon
+# surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipGroupPrecursorTurret
 #
 # Used by:
 # Skill: Surgical Strike
diff --git a/eos/effects/systemsmallprecursorturretdamage.py b/eos/effects/systemsmallprecursorturretdamage.py
new file mode 100644
index 000000000..595b9a679
--- /dev/null
+++ b/eos/effects/systemsmallprecursorturretdamage.py
@@ -0,0 +1,12 @@
+# systemSmallPrecursorTurretDamage
+#
+# Used by:
+# Celestials named like: Wolf Rayet Effect Beacon Class (5 of 6)
+runTime = "early"
+type = ("projected", "passive")
+
+
+def handler(fit, module, context):
+    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Small Precursor Weapon"),
+                                     "damageMultiplier", module.getModifiedItemAttr("smallWeaponDamageMultiplier"),
+                                     stackingPenalties=True)
diff --git a/eos/effects/targetabcattack.py b/eos/effects/targetabcattack.py
index c8d8a8d33..66dac5bc6 100644
--- a/eos/effects/targetabcattack.py
+++ b/eos/effects/targetabcattack.py
@@ -1,7 +1,7 @@
 # targetABCAttack
 #
 # Used by:
-# Modules from group: Precursor Turret (14 of 14)
+# Modules from group: Precursor Weapon (15 of 15)
 type = 'active'
 
 
diff --git a/eos/effects/warpdisruptsphere.py b/eos/effects/warpdisruptsphere.py
index 22787465b..f8ce29992 100644
--- a/eos/effects/warpdisruptsphere.py
+++ b/eos/effects/warpdisruptsphere.py
@@ -1,3 +1,7 @@
+# warpDisruptSphere
+#
+# Used by:
+# Modules from group: Warp Disrupt Field Generator (7 of 7)
 
 # warpDisruptSphere
 #
diff --git a/eos/effects/warpscramble.py b/eos/effects/warpscramble.py
index 476608626..7424625ae 100644
--- a/eos/effects/warpscramble.py
+++ b/eos/effects/warpscramble.py
@@ -1,7 +1,7 @@
 # warpScramble
 #
 # Used by:
-# Modules named like: Warp Disruptor (28 of 28)
+# Modules named like: Warp Disruptor (27 of 27)
 type = "projected", "active"
 
 
diff --git a/eos/effects/warpscrambleblockmwdwithnpceffect.py b/eos/effects/warpscrambleblockmwdwithnpceffect.py
index 0985d4673..27a82548a 100644
--- a/eos/effects/warpscrambleblockmwdwithnpceffect.py
+++ b/eos/effects/warpscrambleblockmwdwithnpceffect.py
@@ -1,7 +1,7 @@
 # warpScrambleBlockMWDWithNPCEffect
 #
 # Used by:
-# Modules named like: Warp Scrambler (27 of 27)
+# Modules named like: Warp Scrambler (26 of 26)
 from eos.saveddata.module import State
 
 runTime = "early"
diff --git a/eos/effects/weatherbasic.py b/eos/effects/weatherbasic.py
index 726601d67..fac65d882 100644
--- a/eos/effects/weatherbasic.py
+++ b/eos/effects/weatherbasic.py
@@ -1,3 +1,4 @@
+# Not used by any item
 runTime = "early"
 type = ("projected", "passive")
 
diff --git a/eos/effects/weathercaustictoxin.py b/eos/effects/weathercaustictoxin.py
index 6856fc272..dcbf5a004 100644
--- a/eos/effects/weathercaustictoxin.py
+++ b/eos/effects/weathercaustictoxin.py
@@ -1,3 +1,4 @@
+# Not used by any item
 runTime = "early"
 type = ("projected", "passive", "gang")
 
diff --git a/eos/effects/weatherdarkness.py b/eos/effects/weatherdarkness.py
index 6856fc272..dcbf5a004 100644
--- a/eos/effects/weatherdarkness.py
+++ b/eos/effects/weatherdarkness.py
@@ -1,3 +1,4 @@
+# Not used by any item
 runTime = "early"
 type = ("projected", "passive", "gang")
 
diff --git a/eos/effects/weatherelectricstorm.py b/eos/effects/weatherelectricstorm.py
index 6856fc272..dcbf5a004 100644
--- a/eos/effects/weatherelectricstorm.py
+++ b/eos/effects/weatherelectricstorm.py
@@ -1,3 +1,4 @@
+# Not used by any item
 runTime = "early"
 type = ("projected", "passive", "gang")
 
diff --git a/eos/effects/weatherinfernal.py b/eos/effects/weatherinfernal.py
index 6856fc272..dcbf5a004 100644
--- a/eos/effects/weatherinfernal.py
+++ b/eos/effects/weatherinfernal.py
@@ -1,3 +1,4 @@
+# Not used by any item
 runTime = "early"
 type = ("projected", "passive", "gang")
 
diff --git a/eos/effects/weatherxenongas.py b/eos/effects/weatherxenongas.py
index 6856fc272..dcbf5a004 100644
--- a/eos/effects/weatherxenongas.py
+++ b/eos/effects/weatherxenongas.py
@@ -1,3 +1,4 @@
+# Not used by any item
 runTime = "early"
 type = ("projected", "passive", "gang")
 
diff --git a/eve.db b/eve.db
index 7dfe70273..41d336d1d 100644
Binary files a/eve.db and b/eve.db differ