diff --git a/eos/effects/elitebonusheavyinterdictorswarpdisruptfieldgeneratorwarpscramblerange2.py b/eos/effects/elitebonusheavyinterdictorswarpdisruptfieldgeneratorwarpscramblerange2.py
index f73326783..edf638622 100644
--- a/eos/effects/elitebonusheavyinterdictorswarpdisruptfieldgeneratorwarpscramblerange2.py
+++ b/eos/effects/elitebonusheavyinterdictorswarpdisruptfieldgeneratorwarpscramblerange2.py
@@ -1,7 +1,7 @@
 # eliteBonusHeavyInterdictorsWarpDisruptFieldGeneratorWarpScrambleRange2
 #
 # Used by:
-# Ships from group: Heavy Interdiction Cruiser (4 of 5)
+# Ships from group: Heavy Interdiction Cruiser (5 of 5)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Disrupt Field Generator",
diff --git a/eos/effects/interceptor2warpscramblerange.py b/eos/effects/interceptor2warpscramblerange.py
index e188fe9c6..7e69a885f 100644
--- a/eos/effects/interceptor2warpscramblerange.py
+++ b/eos/effects/interceptor2warpscramblerange.py
@@ -1,7 +1,7 @@
 # Interceptor2WarpScrambleRange
 #
 # Used by:
-# Ships from group: Interceptor (5 of 10)
+# Ships from group: Interceptor (6 of 10)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler",
diff --git a/eos/effects/interceptormwdsignatureradiusbonus.py b/eos/effects/interceptormwdsignatureradiusbonus.py
index 8b52a1147..146fce80e 100644
--- a/eos/effects/interceptormwdsignatureradiusbonus.py
+++ b/eos/effects/interceptormwdsignatureradiusbonus.py
@@ -1,7 +1,7 @@
 # interceptorMWDSignatureRadiusBonus
 #
 # Used by:
-# Ships from group: Interceptor (9 of 10)
+# Ships from group: Interceptor (10 of 10)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
diff --git a/eos/effects/shipbonuswdfgnullspeedeffects.py b/eos/effects/shipbonuswdfgnullspeedeffects.py
new file mode 100644
index 000000000..448c54db5
--- /dev/null
+++ b/eos/effects/shipbonuswdfgnullspeedeffects.py
@@ -0,0 +1,13 @@
+# shipBonusWDFGnullSpeedEffects
+#
+# Used by:
+# Ship: Fiend
+runTime = "early"
+type = "passive"
+def handler(fit, ship, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Propulsion Jamming"),
+                                  "speedFactorBonus", ship.getModifiedItemAttr("shipBonusAT"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Propulsion Jamming"),
+                                  "speedBoostFactorBonus", ship.getModifiedItemAttr("shipBonusAT"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Propulsion Jamming"),
+                                  "massBonusPercentage", ship.getModifiedItemAttr("shipBonusAT"))
diff --git a/eos/effects/shipcappropulsionjamming.py b/eos/effects/shipcappropulsionjamming.py
index 9f7e60a39..1b3bb08c1 100644
--- a/eos/effects/shipcappropulsionjamming.py
+++ b/eos/effects/shipcappropulsionjamming.py
@@ -1,7 +1,7 @@
 # shipCapPropulsionJamming
 #
 # Used by:
-# Ships from group: Interceptor (9 of 10)
+# Ships from group: Interceptor (10 of 10)
 # Ship: Atron
 # Ship: Condor
 # Ship: Executioner
diff --git a/eos/effects/shipshieldemresistancerookie.py b/eos/effects/shipshieldemresistancerookie.py
index e0e1b7f82..c767db3fd 100644
--- a/eos/effects/shipshieldemresistancerookie.py
+++ b/eos/effects/shipshieldemresistancerookie.py
@@ -1,9 +1,8 @@
 # shipShieldEMResistanceRookie
 #
 # Used by:
-# Ship: Broadsword
+# Ships from group: Heavy Interdiction Cruiser (3 of 5)
 # Ship: Ibis
-# Ship: Onyx
 # Ship: Taipan
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipshieldexplosiveresistancerookie.py b/eos/effects/shipshieldexplosiveresistancerookie.py
index 9b95a0429..7ef2c5713 100644
--- a/eos/effects/shipshieldexplosiveresistancerookie.py
+++ b/eos/effects/shipshieldexplosiveresistancerookie.py
@@ -1,9 +1,8 @@
 # shipShieldExplosiveResistanceRookie
 #
 # Used by:
-# Ship: Broadsword
+# Ships from group: Heavy Interdiction Cruiser (3 of 5)
 # Ship: Ibis
-# Ship: Onyx
 # Ship: Taipan
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipshieldkineticresistancerookie.py b/eos/effects/shipshieldkineticresistancerookie.py
index a7b4e2b0b..5ede0d774 100644
--- a/eos/effects/shipshieldkineticresistancerookie.py
+++ b/eos/effects/shipshieldkineticresistancerookie.py
@@ -1,9 +1,8 @@
 # shipShieldKineticResistanceRookie
 #
 # Used by:
-# Ship: Broadsword
+# Ships from group: Heavy Interdiction Cruiser (3 of 5)
 # Ship: Ibis
-# Ship: Onyx
 # Ship: Taipan
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipshieldthermalresistancerookie.py b/eos/effects/shipshieldthermalresistancerookie.py
index 74f1cc7f6..4190a1a32 100644
--- a/eos/effects/shipshieldthermalresistancerookie.py
+++ b/eos/effects/shipshieldthermalresistancerookie.py
@@ -1,9 +1,8 @@
 # shipShieldThermalResistanceRookie
 #
 # Used by:
-# Ship: Broadsword
+# Ships from group: Heavy Interdiction Cruiser (3 of 5)
 # Ship: Ibis
-# Ship: Onyx
 # Ship: Taipan
 type = "passive"
 def handler(fit, ship, context):
diff --git a/service/market.py b/service/market.py
index ae31f31b9..e0a77b8b3 100644
--- a/service/market.py
+++ b/service/market.py
@@ -233,8 +233,6 @@ class Market():
             "Mobile Decoy Unit": False,  # Seems to be left over test mod for deployables
             "Tournament Micro Jump Unit": False,  # Normally seen only on tournament arenas
             "Council Diplomatic Shuttle": False,  # CSM X celebration]
-            "Imp": False,  # AT13 prize
-            "Fiend": False,  # AT13 prize
         }
 
         # do not publish ships that we convert
diff --git a/staticdata/eve.db b/staticdata/eve.db
index 58076e353..785349e3f 100644
Binary files a/staticdata/eve.db and b/staticdata/eve.db differ