diff --git a/eos/effects/capitallauncherskillcruisecitadelemdamage1.py b/eos/effects/capitallauncherskillcruisecitadelemdamage1.py
index a6fbc2b97f..de758b0f06 100644
--- a/eos/effects/capitallauncherskillcruisecitadelemdamage1.py
+++ b/eos/effects/capitallauncherskillcruisecitadelemdamage1.py
@@ -1,4 +1,4 @@
-# 	capitalLauncherSkillCruiseCitadelEmDamage1
+# capitalLauncherSkillCruiseCitadelEmDamage1
 #
 # Used by:
 # Skill: XL Cruise Missiles
diff --git a/eos/effects/decreasetargetspeed.py b/eos/effects/decreasetargetspeed.py
index d19823d8d3..7a6fbf9b0a 100644
--- a/eos/effects/decreasetargetspeed.py
+++ b/eos/effects/decreasetargetspeed.py
@@ -1,7 +1,4 @@
-# decreaseTargetSpeed
-#
-# Used by:
-# Drones from group: Stasis Webifying Drone (3 of 3)
+# Not used by any item
 type = "active", "projected"
 def handler(fit, module, context):
     if "projected" not in context:
diff --git a/eos/effects/dronedamagebonusrequringdrones.py b/eos/effects/dronedamagebonusrequringdrones.py
index 80bcff017d..0baf75d991 100644
--- a/eos/effects/dronedamagebonusrequringdrones.py
+++ b/eos/effects/dronedamagebonusrequringdrones.py
@@ -1,7 +1,4 @@
-# droneDamageBonusRequringDrones
-#
-# Used by:
-# Skill: Drone Interfacing
+# Not used by any item
 type = "passive"
 def handler(fit, skill, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
diff --git a/eos/effects/elitebonuscommanddestroyermwdsigradius3.py b/eos/effects/elitebonuscommanddestroyermwdsigradius3.py
index 34abe1494e..330679036c 100644
--- a/eos/effects/elitebonuscommanddestroyermwdsigradius3.py
+++ b/eos/effects/elitebonuscommanddestroyermwdsigradius3.py
@@ -1,7 +1,4 @@
-# eliteBonusCommandDestroyerMWDSigRadius3
-#
-# Used by:
-# Ships from group: Command Destroyers (4 of 4)
+# Not used by any item
 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/elitebonuslogisticremotearmorrepaircapneed1.py b/eos/effects/elitebonuslogisticremotearmorrepaircapneed1.py
index 3323288f1b..f92fc8c871 100644
--- a/eos/effects/elitebonuslogisticremotearmorrepaircapneed1.py
+++ b/eos/effects/elitebonuslogisticremotearmorrepaircapneed1.py
@@ -1,3 +1,7 @@
+# eliteBonusLogisticRemoteArmorRepairCapNeed1
+#
+# Used by:
+# Ship: Oneiros
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed", src.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers")
diff --git a/eos/effects/elitebonuslogisticremotearmorrepaircapneed2.py b/eos/effects/elitebonuslogisticremotearmorrepaircapneed2.py
index 8817d38dd1..283490e878 100644
--- a/eos/effects/elitebonuslogisticremotearmorrepaircapneed2.py
+++ b/eos/effects/elitebonuslogisticremotearmorrepaircapneed2.py
@@ -1,3 +1,7 @@
+# eliteBonusLogisticRemoteArmorRepairCapNeed2
+#
+# Used by:
+# Ship: Guardian
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed", src.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics Cruisers")
diff --git a/eos/effects/elitebonuslogisticshieldtransfercapneed1.py b/eos/effects/elitebonuslogisticshieldtransfercapneed1.py
index 6e0bec64f0..d8bdb54419 100644
--- a/eos/effects/elitebonuslogisticshieldtransfercapneed1.py
+++ b/eos/effects/elitebonuslogisticshieldtransfercapneed1.py
@@ -1,3 +1,8 @@
+# eliteBonusLogisticShieldTransferCapNeed1
+#
+# Used by:
+# Ship: Basilisk
+# Ship: Etana
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "capacitorNeed", src.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers")
diff --git a/eos/effects/elitebonuslogisticshieldtransfercapneed2.py b/eos/effects/elitebonuslogisticshieldtransfercapneed2.py
index 136cb4fc4a..4acb6ef52a 100644
--- a/eos/effects/elitebonuslogisticshieldtransfercapneed2.py
+++ b/eos/effects/elitebonuslogisticshieldtransfercapneed2.py
@@ -1,3 +1,7 @@
+# eliteBonusLogisticShieldTransferCapNeed2
+#
+# Used by:
+# Ship: Scimitar
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "capacitorNeed", src.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics Cruisers")
diff --git a/eos/effects/energydestabilizationnew.py b/eos/effects/energydestabilizationnew.py
index fefadab402..c07517b0b0 100644
--- a/eos/effects/energydestabilizationnew.py
+++ b/eos/effects/energydestabilizationnew.py
@@ -1,7 +1,4 @@
-# energyDestabilizationNew
-#
-# Used by:
-# Drones from group: Energy Neutralizer Drone (3 of 3)
+# Not used by any item
 from eos.types import State
 type = "active", "projected"
 def handler(fit, container, context):
diff --git a/eos/effects/energyneutralizerentity.py b/eos/effects/energyneutralizerentity.py
new file mode 100644
index 0000000000..49b895385a
--- /dev/null
+++ b/eos/effects/energyneutralizerentity.py
@@ -0,0 +1,12 @@
+# energyNeutralizerEntity
+#
+# Used by:
+# Drones from group: Energy Neutralizer Drone (3 of 3)
+from eos.types import State
+type = "active", "projected"
+def handler(fit, container, context):
+    if "projected" in context and ((hasattr(container, "state") \
+    and container.state >= State.ACTIVE) or hasattr(container, "amountActive")):
+        amount = container.getModifiedItemAttr("energyDestabilizationAmount")
+        time = container.getModifiedItemAttr("duration")
+        fit.addDrain(time, amount, 0)
diff --git a/eos/effects/energyneutralizerfalloff.py b/eos/effects/energyneutralizerfalloff.py
index 6bd17c18e4..4896cec2d4 100644
--- a/eos/effects/energyneutralizerfalloff.py
+++ b/eos/effects/energyneutralizerfalloff.py
@@ -1,7 +1,6 @@
 # energyNeutralizerFalloff
 #
 # Used by:
-# Drones from group: Energy Neutralizer Drone (3 of 3)
 # Modules from group: Energy Neutralizer (51 of 51)
 from eos.types import State
 type = "active", "projected"
diff --git a/eos/effects/energytransfer.py b/eos/effects/energytransfer.py
index 3c82a340ce..8390cf52c4 100644
--- a/eos/effects/energytransfer.py
+++ b/eos/effects/energytransfer.py
@@ -1,7 +1,4 @@
-# energyTransfer
-#
-# Used by:
-# Modules from group: Remote Capacitor Transmitter (38 of 38)
+# Not used by any item
 type = "projected", "active"
 def handler(fit, module, context):
     if "projected" in context:
diff --git a/eos/effects/ewtargetpaint.py b/eos/effects/ewtargetpaint.py
index 1f13ea821d..4be80da74b 100644
--- a/eos/effects/ewtargetpaint.py
+++ b/eos/effects/ewtargetpaint.py
@@ -1,7 +1,4 @@
-# ewTargetPaint
-#
-# Used by:
-# Drones named like: TP (3 of 3)
+# Not used by any item
 type = "projected", "active"
 def handler(fit, container, context):
     if "projected" in context:
diff --git a/eos/effects/fighterabilityattackm.py b/eos/effects/fighterabilityattackm.py
index dd41d77dca..d2d14119c6 100644
--- a/eos/effects/fighterabilityattackm.py
+++ b/eos/effects/fighterabilityattackm.py
@@ -1,3 +1,4 @@
+# Not used by any item
 """
 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 e211e7424f..c18825aad7 100644
--- a/eos/effects/fighterabilityecm.py
+++ b/eos/effects/fighterabilityecm.py
@@ -1,3 +1,4 @@
+# Not used by any item
 """
 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 ca0460e158..0315e4301c 100644
--- a/eos/effects/fighterabilityenergyneutralizer.py
+++ b/eos/effects/fighterabilityenergyneutralizer.py
@@ -1,3 +1,4 @@
+# Not used by any item
 """
 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 55e5eca15d..5a9513e1dc 100644
--- a/eos/effects/fighterabilitylaunchbomb.py
+++ b/eos/effects/fighterabilitylaunchbomb.py
@@ -1,3 +1,4 @@
+# Not used by any item
 """
 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 7d5bc13e65..9e2303ec4c 100644
--- a/eos/effects/fighterabilitymicrowarpdrive.py
+++ b/eos/effects/fighterabilitymicrowarpdrive.py
@@ -1,3 +1,4 @@
+# Not used by any item
 """
 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 16e7ee8b2f..7615f56163 100644
--- a/eos/effects/fighterabilitymissiles.py
+++ b/eos/effects/fighterabilitymissiles.py
@@ -1,3 +1,4 @@
+# Not used by any item
 """
 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 2a3aa03932..f067859bc4 100644
--- a/eos/effects/fighterabilitystasiswebifier.py
+++ b/eos/effects/fighterabilitystasiswebifier.py
@@ -1,3 +1,4 @@
+# Not used by any item
 """
 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 8e74b35d79..b0e0c281d5 100644
--- a/eos/effects/fighterabilitywarpdisruption.py
+++ b/eos/effects/fighterabilitywarpdisruption.py
@@ -1,3 +1,4 @@
+# Not used by any item
 """
 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/maraudermodeeffect26.py b/eos/effects/maraudermodeeffect26.py
index 61d228dd2f..74b730de6e 100644
--- a/eos/effects/maraudermodeeffect26.py
+++ b/eos/effects/maraudermodeeffect26.py
@@ -1,7 +1,4 @@
-# marauderModeEffect26
-#
-# Used by:
-# Module: Bastion Module I
+# Not used by any item
 type = "active"
 runTime = "early"
 def handler(fit, module, context):
diff --git a/eos/effects/modulebonusancillaryremotearmorrepairer.py b/eos/effects/modulebonusancillaryremotearmorrepairer.py
index 21a444a620..ba176a64f1 100644
--- a/eos/effects/modulebonusancillaryremotearmorrepairer.py
+++ b/eos/effects/modulebonusancillaryremotearmorrepairer.py
@@ -1,3 +1,7 @@
+# moduleBonusAncillaryRemoteArmorRepairer
+#
+# Used by:
+# Modules from group: Ancillary Remote Armor Repairer (4 of 4)
 runTime = "late"
 type = "projected", "active"
 def handler(fit, module, context):
diff --git a/eos/effects/modulebonusancillaryremoteshieldbooster.py b/eos/effects/modulebonusancillaryremoteshieldbooster.py
index c10ccef706..2aab65f2a6 100644
--- a/eos/effects/modulebonusancillaryremoteshieldbooster.py
+++ b/eos/effects/modulebonusancillaryremoteshieldbooster.py
@@ -1,3 +1,7 @@
+# moduleBonusAncillaryRemoteShieldBooster
+#
+# Used by:
+# Modules from group: Ancillary Remote Shield Booster (4 of 4)
 runTime = "late"
 type = "projected", "active"
 def handler(fit, module, context):
diff --git a/eos/effects/overloadselfdamagebonus.py b/eos/effects/overloadselfdamagebonus.py
index 305e9d3d5b..0ff334285b 100644
--- a/eos/effects/overloadselfdamagebonus.py
+++ b/eos/effects/overloadselfdamagebonus.py
@@ -1,9 +1,9 @@
 # overloadSelfDamageBonus
 #
 # Used by:
-# Modules from group: Energy Weapon (102 of 209)
-# Modules from group: Hybrid Weapon (106 of 221)
-# Modules from group: Projectile Weapon (100 of 165)
+# Modules from group: Energy Weapon (101 of 209)
+# Modules from group: Hybrid Weapon (105 of 221)
+# Modules from group: Projectile Weapon (99 of 165)
 type = "overheat"
 def handler(fit, module, context):
     module.boostItemAttr("damageMultiplier", module.getModifiedItemAttr("overloadDamageModifier"))
\ No newline at end of file
diff --git a/eos/effects/remotearmorpowerneedbonuseffect.py b/eos/effects/remotearmorpowerneedbonuseffect.py
index ac787d18b5..9940ffe884 100644
--- a/eos/effects/remotearmorpowerneedbonuseffect.py
+++ b/eos/effects/remotearmorpowerneedbonuseffect.py
@@ -1,3 +1,8 @@
+# remoteArmorPowerNeedBonusEffect
+#
+# Used by:
+# Ship: Guardian
+# Ship: Oneiros
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "power", src.getModifiedItemAttr("remoteArmorPowerNeedBonus"))
diff --git a/eos/effects/remotearmorrepairentity.py b/eos/effects/remotearmorrepairentity.py
new file mode 100644
index 0000000000..4b4b049fce
--- /dev/null
+++ b/eos/effects/remotearmorrepairentity.py
@@ -0,0 +1,10 @@
+# remoteArmorRepairEntity
+#
+# Used by:
+# Drones named like: Armor Maintenance Bot (6 of 6)
+type = "projected", "active"
+def handler(fit, container, context):
+    if "projected" in context:
+        bonus = container.getModifiedItemAttr("armorDamageAmount")
+        duration = container.getModifiedItemAttr("duration") / 1000.0
+        fit.extraAttributes.increase("armorRepair", bonus / duration)
diff --git a/eos/effects/remotearmorrepairfalloff.py b/eos/effects/remotearmorrepairfalloff.py
index 01ebfd10f6..6a1849234d 100644
--- a/eos/effects/remotearmorrepairfalloff.py
+++ b/eos/effects/remotearmorrepairfalloff.py
@@ -2,7 +2,6 @@
 #
 # Used by:
 # Modules from group: Remote Armor Repairer (39 of 39)
-# Drones named like: Armor Maintenance Bot (6 of 6)
 type = "projected", "active"
 def handler(fit, container, context):
     if "projected" in context:
diff --git a/eos/effects/remoteecmburst.py b/eos/effects/remoteecmburst.py
index cd54b4cbc4..45ca33f3fc 100644
--- a/eos/effects/remoteecmburst.py
+++ b/eos/effects/remoteecmburst.py
@@ -1,7 +1,4 @@
-# remoteEcmBurst
-#
-# Used by:
-# Module: ECM Jammer Burst Projector
+# Not used by any item
 type = 'active'
 def handler(fit, module, context):
     pass
diff --git a/eos/effects/remotehullrepair.py b/eos/effects/remotehullrepair.py
index 1bf1fd50a0..84ee642902 100644
--- a/eos/effects/remotehullrepair.py
+++ b/eos/effects/remotehullrepair.py
@@ -1,7 +1,4 @@
-# remoteHullRepair
-#
-# Used by:
-# Drones named like: Hull Maintenance Bot (6 of 6)
+# Not used by any item
 type = "projected", "active"
 runTime = "late"
 def handler(fit, module, context):
diff --git a/eos/effects/remotehullrepairentity.py b/eos/effects/remotehullrepairentity.py
new file mode 100644
index 0000000000..4f41aec228
--- /dev/null
+++ b/eos/effects/remotehullrepairentity.py
@@ -0,0 +1,11 @@
+# remoteHullRepairEntity
+#
+# Used by:
+# Drones named like: Hull Maintenance Bot (6 of 6)
+type = "projected", "active"
+runTime = "late"
+def handler(fit, module, context):
+    if "projected" not in context: return
+    bonus = module.getModifiedItemAttr("structureDamageAmount")
+    duration = module.getModifiedItemAttr("duration") / 1000.0
+    fit.extraAttributes.increase("hullRepair", bonus / duration)
diff --git a/eos/effects/remotehullrepairfalloff.py b/eos/effects/remotehullrepairfalloff.py
index 41ccddae1d..94dc050c7b 100644
--- a/eos/effects/remotehullrepairfalloff.py
+++ b/eos/effects/remotehullrepairfalloff.py
@@ -2,7 +2,6 @@
 #
 # Used by:
 # Modules from group: Remote Hull Repairer (8 of 8)
-# Drones named like: Hull Maintenance Bot (6 of 6)
 type = "projected", "active"
 runTime = "late"
 def handler(fit, module, context):
diff --git a/eos/effects/remotesensordampentity.py b/eos/effects/remotesensordampentity.py
new file mode 100644
index 0000000000..2176a5a51f
--- /dev/null
+++ b/eos/effects/remotesensordampentity.py
@@ -0,0 +1,14 @@
+# remoteSensorDampEntity
+#
+# Used by:
+# Drones named like: SD (3 of 3)
+type= "projected", "active"
+def handler(fit, module, context):
+    if "projected" not in context:
+        return
+
+    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
+                           stackingPenalties = True, remoteResists=True)
+
+    fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
+                           stackingPenalties = True, remoteResists=True)
diff --git a/eos/effects/remotesensordampfalloff.py b/eos/effects/remotesensordampfalloff.py
index 3a5f7ab278..0339ee1968 100644
--- a/eos/effects/remotesensordampfalloff.py
+++ b/eos/effects/remotesensordampfalloff.py
@@ -2,16 +2,13 @@
 #
 # Used by:
 # Modules from group: Sensor Dampener (6 of 6)
-# Drones named like: SD (3 of 3)
 type= "projected", "active"
 def handler(fit, module, context):
     if "projected" not in context:
         return
 
-    print "in sensor damp projection on ", fit, module.getModifiedItemAttr("maxTargetRangeBonus")
-    print fit.ship.getModifiedItemAttr('maxTargetRange')
     fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
                            stackingPenalties = True, remoteResists=True)
-    print fit.ship.getModifiedItemAttr('maxTargetRange')
+
     fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
                            stackingPenalties = True, remoteResists=True)
diff --git a/eos/effects/remoteshieldtransferentity.py b/eos/effects/remoteshieldtransferentity.py
new file mode 100644
index 0000000000..7a1fb0e20f
--- /dev/null
+++ b/eos/effects/remoteshieldtransferentity.py
@@ -0,0 +1,10 @@
+# remoteShieldTransferEntity
+#
+# Used by:
+# Drones named like: Shield Maintenance Bot (6 of 6)
+type = "projected", "active"
+def handler(fit, container, context):
+    if "projected" in context:
+        bonus = container.getModifiedItemAttr("shieldBonus")
+        duration = container.getModifiedItemAttr("duration") / 1000.0
+        fit.extraAttributes.increase("shieldRepair", bonus / duration)
diff --git a/eos/effects/remoteshieldtransferfalloff.py b/eos/effects/remoteshieldtransferfalloff.py
index 8833418597..1506da541c 100644
--- a/eos/effects/remoteshieldtransferfalloff.py
+++ b/eos/effects/remoteshieldtransferfalloff.py
@@ -2,7 +2,6 @@
 #
 # Used by:
 # Modules from group: Remote Shield Booster (38 of 38)
-# Drones named like: Shield Maintenance Bot (6 of 6)
 type = "projected", "active"
 def handler(fit, container, context):
     if "projected" in context:
diff --git a/eos/effects/remotetargetpaintentity.py b/eos/effects/remotetargetpaintentity.py
new file mode 100644
index 0000000000..4c001bd413
--- /dev/null
+++ b/eos/effects/remotetargetpaintentity.py
@@ -0,0 +1,9 @@
+# remoteTargetPaintEntity
+#
+# Used by:
+# Drones named like: TP (3 of 3)
+type = "projected", "active"
+def handler(fit, container, context):
+    if "projected" in context:
+        fit.ship.boostItemAttr("signatureRadius", container.getModifiedItemAttr("signatureRadiusBonus"),
+                               stackingPenalties = True, remoteResists=True)
diff --git a/eos/effects/remotetargetpaintfalloff.py b/eos/effects/remotetargetpaintfalloff.py
index 6c00262531..2d1fcb5393 100644
--- a/eos/effects/remotetargetpaintfalloff.py
+++ b/eos/effects/remotetargetpaintfalloff.py
@@ -2,7 +2,6 @@
 #
 # Used by:
 # Modules from group: Target Painter (8 of 8)
-# Drones named like: TP (3 of 3)
 type = "projected", "active"
 def handler(fit, container, context):
     if "projected" in context:
diff --git a/eos/effects/remotetrackingdisruptfalloff.py b/eos/effects/remotetrackingdisruptfalloff.py
index d3066d78fa..9ea0a7f4e6 100644
--- a/eos/effects/remotetrackingdisruptfalloff.py
+++ b/eos/effects/remotetrackingdisruptfalloff.py
@@ -1,7 +1,6 @@
 # remoteTrackingDisruptFalloff
 #
 # Used by:
-# Drones named like: TD (3 of 3)
 # Variations of module: Tracking Disruptor I (6 of 6)
 type= "projected", "active"
 def handler(fit, module, context):
diff --git a/eos/effects/remoteweapondisruptentity.py b/eos/effects/remoteweapondisruptentity.py
new file mode 100644
index 0000000000..3b997e1473
--- /dev/null
+++ b/eos/effects/remoteweapondisruptentity.py
@@ -0,0 +1,16 @@
+# remoteWeaponDisruptEntity
+#
+# Used by:
+# Drones named like: TD (3 of 3)
+type= "projected", "active"
+def handler(fit, module, context):
+    if "projected" in context:
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
+                                      "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
+                                      stackingPenalties = True, remoteResists=True)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
+                                      "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
+                                      stackingPenalties = True, remoteResists=True)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
+                                      "falloff", module.getModifiedItemAttr("falloffBonus"),
+                                      stackingPenalties = True, remoteResists=True)
diff --git a/eos/effects/remotewebifierentity.py b/eos/effects/remotewebifierentity.py
new file mode 100644
index 0000000000..36186be000
--- /dev/null
+++ b/eos/effects/remotewebifierentity.py
@@ -0,0 +1,9 @@
+# remoteWebifierEntity
+#
+# Used by:
+# Drones from group: Stasis Webifying Drone (3 of 3)
+type = "active", "projected"
+def handler(fit, module, context):
+    if "projected" not in context: return
+    fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("speedFactor"),
+                           stackingPenalties = True, remoteResists=True)
diff --git a/eos/effects/remotewebifierfalloff.py b/eos/effects/remotewebifierfalloff.py
index eb974b3d41..1f37c29c5b 100644
--- a/eos/effects/remotewebifierfalloff.py
+++ b/eos/effects/remotewebifierfalloff.py
@@ -1,7 +1,6 @@
 # remoteWebifierFalloff
 #
 # Used by:
-# Drones from group: Stasis Webifying Drone (3 of 3)
 # Modules from group: Stasis Grappler (7 of 7)
 # Modules from group: Stasis Web (18 of 18)
 type = "active", "projected"
diff --git a/eos/effects/shieldtransportcpuneedbonuseffect.py b/eos/effects/shieldtransportcpuneedbonuseffect.py
index 8ea54771cd..0e5cf26bf7 100644
--- a/eos/effects/shieldtransportcpuneedbonuseffect.py
+++ b/eos/effects/shieldtransportcpuneedbonuseffect.py
@@ -1,3 +1,7 @@
+# shieldTransportCpuNeedBonusEffect
+#
+# Used by:
+# Ships from group: Logistics (3 of 5)
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "cpu", src.getModifiedItemAttr("shieldTransportCpuNeedBonus"))
diff --git a/eos/effects/shipbonusenergyvampirerangead2.py b/eos/effects/shipbonusenergyvampirerangead2.py
index 90f0554733..5739edcbcf 100644
--- a/eos/effects/shipbonusenergyvampirerangead2.py
+++ b/eos/effects/shipbonusenergyvampirerangead2.py
@@ -1,7 +1,4 @@
-# shipBonusEnergyVampireRangeAD2
-#
-# Used by:
-# Ship: Dragoon
+# Not used by any item
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
diff --git a/eos/effects/shipbonusremotearmorrepairamount2af.py b/eos/effects/shipbonusremotearmorrepairamount2af.py
index fc689f38ff..c672f9496c 100644
--- a/eos/effects/shipbonusremotearmorrepairamount2af.py
+++ b/eos/effects/shipbonusremotearmorrepairamount2af.py
@@ -1,3 +1,8 @@
+# shipBonusRemoteArmorRepairAmount2AF
+#
+# Used by:
+# Ship: Deacon
+# Ship: Inquisitor
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "armorDamageAmount", src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipbonusremotearmorrepairamountac2.py b/eos/effects/shipbonusremotearmorrepairamountac2.py
index 1529e48fa3..2b56129bf1 100644
--- a/eos/effects/shipbonusremotearmorrepairamountac2.py
+++ b/eos/effects/shipbonusremotearmorrepairamountac2.py
@@ -1,3 +1,7 @@
+# shipBonusRemoteArmorRepairAmountAC2
+#
+# Used by:
+# Ship: Augoror
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "armorDamageAmount", src.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipbonusremotearmorrepairamountgc2.py b/eos/effects/shipbonusremotearmorrepairamountgc2.py
index 3a8e1d533f..7612f01912 100644
--- a/eos/effects/shipbonusremotearmorrepairamountgc2.py
+++ b/eos/effects/shipbonusremotearmorrepairamountgc2.py
@@ -1,3 +1,7 @@
+# shipBonusRemoteArmorRepairAmountGC2
+#
+# Used by:
+# Ship: Exequror
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "armorDamageAmount", src.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonusremotearmorrepairamountgf2.py b/eos/effects/shipbonusremotearmorrepairamountgf2.py
index 6f77764514..40475557ad 100644
--- a/eos/effects/shipbonusremotearmorrepairamountgf2.py
+++ b/eos/effects/shipbonusremotearmorrepairamountgf2.py
@@ -1,3 +1,7 @@
+# shipBonusRemoteArmorRepairAmountGF2
+#
+# Used by:
+# Variations of ship: Navitas (2 of 2)
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "armorDamageAmount", src.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/shipbonusremotearmorrepaircapneedac1.py b/eos/effects/shipbonusremotearmorrepaircapneedac1.py
index 5f7c040026..d9257a835d 100644
--- a/eos/effects/shipbonusremotearmorrepaircapneedac1.py
+++ b/eos/effects/shipbonusremotearmorrepaircapneedac1.py
@@ -1,3 +1,7 @@
+# shipBonusRemoteArmorRepairCapNeedAC1
+#
+# Used by:
+# Ship: Augoror
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed", src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipbonusremotearmorrepaircapneedaf.py b/eos/effects/shipbonusremotearmorrepaircapneedaf.py
index 99d2e9705c..56daea7ba2 100644
--- a/eos/effects/shipbonusremotearmorrepaircapneedaf.py
+++ b/eos/effects/shipbonusremotearmorrepaircapneedaf.py
@@ -1,3 +1,8 @@
+# shipBonusRemoteArmorRepairCapNeedAF
+#
+# Used by:
+# Ship: Deacon
+# Ship: Inquisitor
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed", src.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipbonusremotearmorrepaircapneedgc1.py b/eos/effects/shipbonusremotearmorrepaircapneedgc1.py
index 12900c3ab2..79788def7f 100644
--- a/eos/effects/shipbonusremotearmorrepaircapneedgc1.py
+++ b/eos/effects/shipbonusremotearmorrepaircapneedgc1.py
@@ -1,3 +1,7 @@
+# shipBonusRemoteArmorRepairCapNeedGC1
+#
+# Used by:
+# Ship: Exequror
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed", src.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonusremotearmorrepaircapneedgf.py b/eos/effects/shipbonusremotearmorrepaircapneedgf.py
index 9f9f193868..6f2c5fd7ad 100644
--- a/eos/effects/shipbonusremotearmorrepaircapneedgf.py
+++ b/eos/effects/shipbonusremotearmorrepaircapneedgf.py
@@ -1,3 +1,7 @@
+# shipBonusRemoteArmorRepairCapNeedGF
+#
+# Used by:
+# Variations of ship: Navitas (2 of 2)
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed", src.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/shipbonusshieldtransfercapneed1.py b/eos/effects/shipbonusshieldtransfercapneed1.py
index 982fd84786..1414679f29 100644
--- a/eos/effects/shipbonusshieldtransfercapneed1.py
+++ b/eos/effects/shipbonusshieldtransfercapneed1.py
@@ -1,3 +1,7 @@
+# shipBonusShieldTransferCapneed1
+#
+# Used by:
+# Ship: Osprey
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "capacitorNeed", src.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/shipxlprojectiledamagerole.py b/eos/effects/shipxlprojectiledamagerole.py
index fbbb392022..e79fcfda70 100644
--- a/eos/effects/shipxlprojectiledamagerole.py
+++ b/eos/effects/shipxlprojectiledamagerole.py
@@ -1,7 +1,4 @@
-# shipXLProjectileDamageRole
-#
-# Used by:
-# Ship: Naglfar
+# Not used by any item
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"),
diff --git a/eos/effects/skillreactivearmorhardenercapneedbonus.py b/eos/effects/skillreactivearmorhardenercapneedbonus.py
index 888995e40e..e377cd9a9d 100644
--- a/eos/effects/skillreactivearmorhardenercapneedbonus.py
+++ b/eos/effects/skillreactivearmorhardenercapneedbonus.py
@@ -1,3 +1,7 @@
+# skillReactiveArmorHardenerCapNeedBonus
+#
+# Used by:
+# Skill: Resistance Phasing
 type = "passive"
 def handler(fit, src, context):
     lvl = src.level
diff --git a/eos/effects/skillreactivearmorhardenerdurationbonus.py b/eos/effects/skillreactivearmorhardenerdurationbonus.py
index 20ff0d48ef..45e4c0b912 100644
--- a/eos/effects/skillreactivearmorhardenerdurationbonus.py
+++ b/eos/effects/skillreactivearmorhardenerdurationbonus.py
@@ -1,3 +1,7 @@
+# skillReactiveArmorHardenerDurationBonus
+#
+# Used by:
+# Skill: Resistance Phasing
 type = "passive"
 def handler(fit, src, context):
     lvl = src.level
diff --git a/eos/effects/skillremotehullrepairsystemscapneedbonus.py b/eos/effects/skillremotehullrepairsystemscapneedbonus.py
index c9a31e3df3..181ab2239a 100644
--- a/eos/effects/skillremotehullrepairsystemscapneedbonus.py
+++ b/eos/effects/skillremotehullrepairsystemscapneedbonus.py
@@ -1,4 +1,4 @@
-# 	skillRemoteHullRepairSystemsCapNeedBonus
+# skillRemoteHullRepairSystemsCapNeedBonus
 #
 # Used by:
 # Skill: Remote Hull Repair Systems
diff --git a/eos/effects/titanturretdamagescaling.py b/eos/effects/titanturretdamagescaling.py
index ce19cd6c2c..7f549ae75e 100644
--- a/eos/effects/titanturretdamagescaling.py
+++ b/eos/effects/titanturretdamagescaling.py
@@ -1,7 +1,4 @@
-# titanTurretDamageScaling
-#
-# Used by:
-# Ships from group: Titan (4 of 4)
+# Not used by any item
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Gunnery"),
diff --git a/eos/effects/turretweaponrangefallofftrackingspeedmultiplytargethostile.py b/eos/effects/turretweaponrangefallofftrackingspeedmultiplytargethostile.py
index 05ed6876ad..63d9743b90 100644
--- a/eos/effects/turretweaponrangefallofftrackingspeedmultiplytargethostile.py
+++ b/eos/effects/turretweaponrangefallofftrackingspeedmultiplytargethostile.py
@@ -1,7 +1,4 @@
-# turretWeaponRangeFalloffTrackingSpeedMultiplyTargetHostile
-#
-# Used by:
-# Drones named like: TD (3 of 3)
+# Not used by any item
 type = "projected", "active"
 def handler(fit, container, context):
     if "projected" in context:
diff --git a/eos/effects/warpscramble.py b/eos/effects/warpscramble.py
index 9c819a3bcf..96d0b3d402 100644
--- a/eos/effects/warpscramble.py
+++ b/eos/effects/warpscramble.py
@@ -1,9 +1,7 @@
 # warpScramble
 #
 # Used by:
-# Variations of module: Heavy Warp Disruptor I (7 of 7)
-# Variations of module: Warp Disruptor I (19 of 19)
-# Module: Civilian Warp Disruptor
+# Modules named like: Warp Disruptor (27 of 27)
 type = "projected", "active"
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("warpScrambleStatus", module.getModifiedItemAttr("warpScrambleStrength"))
\ No newline at end of file
diff --git a/eos/effects/warpscrambleblockmwdwithnpceffect.py b/eos/effects/warpscrambleblockmwdwithnpceffect.py
index 55cb867d62..5369efc45d 100644
--- a/eos/effects/warpscrambleblockmwdwithnpceffect.py
+++ b/eos/effects/warpscrambleblockmwdwithnpceffect.py
@@ -1,8 +1,7 @@
 # warpScrambleBlockMWDWithNPCEffect
 #
 # Used by:
-# Variations of module: Heavy Warp Scrambler I (7 of 7)
-# Variations of module: Warp Scrambler I (19 of 19)
+# Modules named like: Warp Scrambler (26 of 26)
 runTime = "early"
 type = "projected", "active"
 
diff --git a/eve.db b/eve.db
index 8c442ea89d..25a40b791a 100644
Binary files a/eve.db and b/eve.db differ