diff --git a/eos/effects/ammoinfluencecapneed.py b/eos/effects/ammoinfluencecapneed.py
index f100a752c..ca2bb595b 100755
--- a/eos/effects/ammoinfluencecapneed.py
+++ b/eos/effects/ammoinfluencecapneed.py
@@ -1,5 +1,5 @@
 # Used by:
-# Items from category: Charge (458 of 824)
+# Items from category: Charge (458 of 828)
 type = "passive"
 def handler(fit, module, context):
     # Dirty hack to work around cap charges setting cap booster
diff --git a/eos/effects/ammoinfluencerange.py b/eos/effects/ammoinfluencerange.py
index 749f2b760..ad2b87931 100755
--- a/eos/effects/ammoinfluencerange.py
+++ b/eos/effects/ammoinfluencerange.py
@@ -1,5 +1,5 @@
 # Used by:
-# Items from category: Charge (559 of 824)
+# Items from category: Charge (559 of 828)
 type = "passive"
 def handler(fit, module, context):
     module.multiplyItemAttr("maxRange", module.getModifiedChargeAttr("weaponRangeMultiplier"))
\ No newline at end of file
diff --git a/eos/effects/ammospeedmultiplier.py b/eos/effects/ammospeedmultiplier.py
index 45f65e8ab..264f6792b 100755
--- a/eos/effects/ammospeedmultiplier.py
+++ b/eos/effects/ammospeedmultiplier.py
@@ -1,5 +1,5 @@
 # Used by:
-# Charges from group: Festival Charges (4 of 4)
+# Charges from group: Festival Charges (8 of 8)
 # Charges from group: Survey Probe (3 of 3)
 # Charge: Warp Disrupt Probe
 type = "passive"
diff --git a/eos/effects/openspawncontainer.py b/eos/effects/dohacking.py
similarity index 100%
rename from eos/effects/openspawncontainer.py
rename to eos/effects/dohacking.py
diff --git a/eos/effects/drawbackarmorhp.py b/eos/effects/drawbackarmorhp.py
index ca286f0de..485ba06bd 100755
--- a/eos/effects/drawbackarmorhp.py
+++ b/eos/effects/drawbackarmorhp.py
@@ -1,5 +1,5 @@
 # Used by:
-# Modules from group: Rig Navigation (64 of 64)
+# Modules from group: Rig Navigation (48 of 64)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.boostItemAttr("armorHP", module.getModifiedItemAttr("drawback"))
\ No newline at end of file
diff --git a/eos/effects/drawbackcpuoutput.py b/eos/effects/drawbackcpuoutput.py
index 230dfb827..7ec67cca3 100755
--- a/eos/effects/drawbackcpuoutput.py
+++ b/eos/effects/drawbackcpuoutput.py
@@ -1,5 +1,6 @@
 # Used by:
 # Modules from group: Rig Drones (64 of 64)
+# Modules named like: Optimizer (16 of 16)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.boostItemAttr("cpuOutput", module.getModifiedItemAttr("drawback"))
\ No newline at end of file
diff --git a/eos/effects/elitebonusinterdictorsarmorresist1.py b/eos/effects/elitebonusinterdictorsarmorresist1.py
new file mode 100644
index 000000000..a21b9b3f0
--- /dev/null
+++ b/eos/effects/elitebonusinterdictorsarmorresist1.py
@@ -0,0 +1,8 @@
+# Used by:
+# Ship: Heretic
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Assault Frigates").level
+    for damageType in ("Em", "Thermal", "Explosive", "Kinetic"):
+        fit.ship.boostItemAttr("armor%sDamageResonance" % damageType,
+                               ship.getModifiedItemAttr("eliteBonusInterdictors1") * level)
diff --git a/eos/effects/elitebonusinterdictorsinterdictionspherelauncherreactivationdelay2.py b/eos/effects/elitebonusinterdictorsinterdictionspherelauncherreactivationdelay2.py
deleted file mode 100755
index 96645ef18..000000000
--- a/eos/effects/elitebonusinterdictorsinterdictionspherelauncherreactivationdelay2.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# Used by:
-# Ships from group: Interdictor (4 of 4)
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Interdictors").level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Interdiction Sphere Launcher",
-                                  "moduleReactivationDelay", ship.getModifiedItemAttr("eliteBonusInterdictors2") * level)
diff --git a/eos/effects/elitebonusinterdictorsmissilethermaldamage1.py b/eos/effects/elitebonusinterdictorsmissilethermaldamage1.py
deleted file mode 100755
index bc08b4d08..000000000
--- a/eos/effects/elitebonusinterdictorsmissilethermaldamage1.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# Used by:
-# Ship: Eris
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Interdictors").level
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles") or mod.charge.requiresSkill("Rockets"),
-                                    "thermalDamage", ship.getModifiedItemAttr("eliteBonusInterdictors1") * level)
diff --git a/eos/effects/elitebonusinterdictorsmissilevelocity1.py b/eos/effects/elitebonusinterdictorsmissilevelocity1.py
deleted file mode 100755
index 4ea5d781f..000000000
--- a/eos/effects/elitebonusinterdictorsmissilevelocity1.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# Used by:
-# Ship: Heretic
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Interdictors").level
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusInterdictors1") * level)
diff --git a/eos/effects/elitebonusinterdictorsmwdsigradius2.py b/eos/effects/elitebonusinterdictorsmwdsigradius2.py
new file mode 100644
index 000000000..72096e37a
--- /dev/null
+++ b/eos/effects/elitebonusinterdictorsmwdsigradius2.py
@@ -0,0 +1,7 @@
+# Used by:
+# Ships from group: Interdictor (4 of 4)
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Interdictors").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
+                                  "signatureRadiusBonus", ship.getModifiedItemAttr("eliteBonusInterdictors2") * level)
diff --git a/eos/effects/elitebonusinterdictorsshtdamage1.py b/eos/effects/elitebonusinterdictorsshtdamage1.py
new file mode 100644
index 000000000..9863ccb43
--- /dev/null
+++ b/eos/effects/elitebonusinterdictorsshtdamage1.py
@@ -0,0 +1,7 @@
+# Used by:
+# Ship: Eris
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Interdictors").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
+                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusInterdictors1") * level)
diff --git a/eos/effects/shiprocketemdmgad1.py b/eos/effects/elitebonusmaraudersheavymissiledamageemrole1.py
old mode 100755
new mode 100644
similarity index 59%
rename from eos/effects/shiprocketemdmgad1.py
rename to eos/effects/elitebonusmaraudersheavymissiledamageemrole1.py
index fdf357078..f6986e62c
--- a/eos/effects/shiprocketemdmgad1.py
+++ b/eos/effects/elitebonusmaraudersheavymissiledamageemrole1.py
@@ -1,7 +1,6 @@
 # Used by:
-# Ship: Heretic
+# Ship: Golem
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Amarr Destroyer").level
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "emDamage", ship.getModifiedItemAttr("shipBonusAD1") * level)
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
+                                    "emDamage", ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
diff --git a/eos/effects/shiprocketexplosivedmgad1.py b/eos/effects/elitebonusmaraudersheavymissiledamageexprole1.py
similarity index 57%
rename from eos/effects/shiprocketexplosivedmgad1.py
rename to eos/effects/elitebonusmaraudersheavymissiledamageexprole1.py
index 51b78edb6..10d110e36 100644
--- a/eos/effects/shiprocketexplosivedmgad1.py
+++ b/eos/effects/elitebonusmaraudersheavymissiledamageexprole1.py
@@ -1,7 +1,6 @@
 # Used by:
-# Ship: Heretic
+# Ship: Golem
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Amarr Destroyer").level
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusAD1") * level)
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
+                                    "explosiveDamage", ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
diff --git a/eos/effects/shiprocketkineticdmgad1.py b/eos/effects/elitebonusmaraudersheavymissiledamagekinrole1.py
similarity index 58%
rename from eos/effects/shiprocketkineticdmgad1.py
rename to eos/effects/elitebonusmaraudersheavymissiledamagekinrole1.py
index c02e6dae2..44ba9439e 100644
--- a/eos/effects/shiprocketkineticdmgad1.py
+++ b/eos/effects/elitebonusmaraudersheavymissiledamagekinrole1.py
@@ -1,7 +1,6 @@
 # Used by:
-# Ship: Heretic
+# Ship: Golem
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Amarr Destroyer").level
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusAD1") * level)
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
+                                    "kineticDamage", ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
diff --git a/eos/effects/shiprocketthermaldmgad1.py b/eos/effects/elitebonusmaraudersheavymissiledamagethermrole1.py
old mode 100755
new mode 100644
similarity index 58%
rename from eos/effects/shiprocketthermaldmgad1.py
rename to eos/effects/elitebonusmaraudersheavymissiledamagethermrole1.py
index f7964959b..008b416a6
--- a/eos/effects/shiprocketthermaldmgad1.py
+++ b/eos/effects/elitebonusmaraudersheavymissiledamagethermrole1.py
@@ -1,7 +1,6 @@
 # Used by:
-# Ship: Heretic
+# Ship: Golem
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Amarr Destroyer").level
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusAD1") * level)
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
+                                    "thermalDamage", ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
diff --git a/eos/effects/implantsetwarpspeed.py b/eos/effects/implantsetwarpspeed.py
new file mode 100644
index 000000000..df4f6ed2e
--- /dev/null
+++ b/eos/effects/implantsetwarpspeed.py
@@ -0,0 +1,7 @@
+# Used by:
+# Implants named like: Ascendancy (12 of 12)
+runTime = "early"
+type = "passive"
+def handler(fit, implant, context):
+    fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
+                                      "WarpSBonus", implant.getModifiedItemAttr("implantSetWarpSpeed"))
diff --git a/eos/effects/minigamevirusstrengthbonus.py b/eos/effects/minigamevirusstrengthbonus.py
index f5459bb74..6ab5b0801 100644
--- a/eos/effects/minigamevirusstrengthbonus.py
+++ b/eos/effects/minigamevirusstrengthbonus.py
@@ -1,8 +1,8 @@
 # Used by:
 # Ships from group: Covert Ops (5 of 5)
 # Ships from group: Frigate (10 of 43)
+# Ships named like: Stratios (2 of 2)
 # Subsystems named like: Electronics Emergent Locus Analyzer (4 of 4)
-# Ship: Stratios
 type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
diff --git a/eos/effects/scanstrengthbonuspercentpassive.py b/eos/effects/scanstrengthbonuspercentpassive.py
index ccf9feac1..c5ca45105 100755
--- a/eos/effects/scanstrengthbonuspercentpassive.py
+++ b/eos/effects/scanstrengthbonuspercentpassive.py
@@ -1,5 +1,5 @@
 # Used by:
-# Implants from group: Cyberimplant (20 of 143)
+# Implants from group: Cyberimplant (20 of 155)
 type = "passive"
 def handler(fit, implant, context):
     for type in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
diff --git a/eos/effects/shiparmoremandexpandkinandthmresistanceac2.py b/eos/effects/shiparmoremandexpandkinandthmresistanceac2.py
index 8c28698d8..c386fe6c7 100755
--- a/eos/effects/shiparmoremandexpandkinandthmresistanceac2.py
+++ b/eos/effects/shiparmoremandexpandkinandthmresistanceac2.py
@@ -1,6 +1,6 @@
 # Used by:
+# Ships named like: Stratios (2 of 2)
 # Ship: Sacrilege
-# Ship: Stratios
 # Ship: Vangel
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipbonusaoevelocitystandardmissilescd2.py b/eos/effects/shipbonusaoevelocitystandardmissilescd2.py
index c8a7d4530..1abc91968 100755
--- a/eos/effects/shipbonusaoevelocitystandardmissilescd2.py
+++ b/eos/effects/shipbonusaoevelocitystandardmissilescd2.py
@@ -1,6 +1,5 @@
 # Used by:
 # Ship: Corax
-# Ship: Flycatcher
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Destroyer").level
diff --git a/eos/effects/shipbonusdronedamagemultipliergb2.py b/eos/effects/shipbonusdronedamagemultipliergb2.py
index 3eaa8ed70..2567cae59 100755
--- a/eos/effects/shipbonusdronedamagemultipliergb2.py
+++ b/eos/effects/shipbonusdronedamagemultipliergb2.py
@@ -1,6 +1,5 @@
 # Used by:
 # Variations of ship: Dominix (3 of 3)
-# Ship: Nestor
 # Ship: Rattlesnake
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipbonusdronedamagemultipliergc2.py b/eos/effects/shipbonusdronedamagemultipliergc2.py
index 91c847a9e..0b88dd648 100755
--- a/eos/effects/shipbonusdronedamagemultipliergc2.py
+++ b/eos/effects/shipbonusdronedamagemultipliergc2.py
@@ -1,7 +1,7 @@
 # Used by:
+# Ships named like: Stratios (2 of 2)
 # Variations of ship: Vexor (3 of 4)
 # Ship: Gila
-# Ship: Stratios
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Gallente Cruiser").level
diff --git a/eos/effects/shipbonusdronehitpointsgb2.py b/eos/effects/shipbonusdronehitpointsgb2.py
index 9f3f36e5f..83b91493a 100755
--- a/eos/effects/shipbonusdronehitpointsgb2.py
+++ b/eos/effects/shipbonusdronehitpointsgb2.py
@@ -1,6 +1,5 @@
 # Used by:
 # Variations of ship: Dominix (3 of 3)
-# Ship: Nestor
 # Ship: Rattlesnake
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipbonusdronehitpointsgc2.py b/eos/effects/shipbonusdronehitpointsgc2.py
index 7f7924725..7ca902d43 100755
--- a/eos/effects/shipbonusdronehitpointsgc2.py
+++ b/eos/effects/shipbonusdronehitpointsgc2.py
@@ -1,7 +1,7 @@
 # Used by:
+# Ships named like: Stratios (2 of 2)
 # Variations of ship: Vexor (3 of 4)
 # Ship: Gila
-# Ship: Stratios
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Gallente Cruiser").level
diff --git a/eos/effects/shipbonusemshieldresistancecb2.py b/eos/effects/shipbonusemshieldresistancecb2.py
index 27a656477..ede4bdd6e 100755
--- a/eos/effects/shipbonusemshieldresistancecb2.py
+++ b/eos/effects/shipbonusemshieldresistancecb2.py
@@ -1,5 +1,4 @@
 # Used by:
-# Ship: Nestor
 # Ship: Rattlesnake
 # Ship: Rokh
 # Ship: Scorpion Navy Issue
diff --git a/eos/effects/shipbonusexplosiveshieldresistancecb2.py b/eos/effects/shipbonusexplosiveshieldresistancecb2.py
index 2a337bd0e..dce81a58e 100755
--- a/eos/effects/shipbonusexplosiveshieldresistancecb2.py
+++ b/eos/effects/shipbonusexplosiveshieldresistancecb2.py
@@ -1,5 +1,4 @@
 # Used by:
-# Ship: Nestor
 # Ship: Rattlesnake
 # Ship: Rokh
 # Ship: Scorpion Navy Issue
diff --git a/eos/effects/shipbonushybridtrackinggf2.py b/eos/effects/shipbonushybridtrackinggf2.py
index aae71985f..b79d891d1 100755
--- a/eos/effects/shipbonushybridtrackinggf2.py
+++ b/eos/effects/shipbonushybridtrackinggf2.py
@@ -1,4 +1,5 @@
 # Used by:
+# Ship: Ares
 # Ship: Federation Navy Comet
 # Ship: Tristan
 type = "passive"
diff --git a/eos/effects/shipbonuskineticshieldresistancecb2.py b/eos/effects/shipbonuskineticshieldresistancecb2.py
index ba57e2d72..b0780f386 100755
--- a/eos/effects/shipbonuskineticshieldresistancecb2.py
+++ b/eos/effects/shipbonuskineticshieldresistancecb2.py
@@ -1,5 +1,4 @@
 # Used by:
-# Ship: Nestor
 # Ship: Rattlesnake
 # Ship: Rokh
 # Ship: Scorpion Navy Issue
diff --git a/eos/effects/shipbonuslasercappiratecruiser.py b/eos/effects/shipbonusmetoptimalrangepiratefaction.py
similarity index 53%
rename from eos/effects/shipbonuslasercappiratecruiser.py
rename to eos/effects/shipbonusmetoptimalrangepiratefaction.py
index 81a59e025..3425b2bf4 100644
--- a/eos/effects/shipbonuslasercappiratecruiser.py
+++ b/eos/effects/shipbonusmetoptimalrangepiratefaction.py
@@ -1,6 +1,6 @@
 # Used by:
-# Ship: Stratios
+# Ships named like: Stratios (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                  "maxRange", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipmissileaoevelocityad2.py b/eos/effects/shipbonusmissilevelocityad2.py
old mode 100755
new mode 100644
similarity index 81%
rename from eos/effects/shipmissileaoevelocityad2.py
rename to eos/effects/shipbonusmissilevelocityad2.py
index 0d4f2dad9..f34f9fc6d
--- a/eos/effects/shipmissileaoevelocityad2.py
+++ b/eos/effects/shipbonusmissilevelocityad2.py
@@ -4,4 +4,4 @@ type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Destroyer").level
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "aoeVelocity", ship.getModifiedItemAttr("shipBonusAD2") * level)
+                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusAD2") * level)
diff --git a/eos/effects/elitebonusinterdictorsbubblerof2.py b/eos/effects/shipbonusrhmlrof2cb.py
old mode 100755
new mode 100644
similarity index 51%
rename from eos/effects/elitebonusinterdictorsbubblerof2.py
rename to eos/effects/shipbonusrhmlrof2cb.py
index e54939009..b8d20f98b
--- a/eos/effects/elitebonusinterdictorsbubblerof2.py
+++ b/eos/effects/shipbonusrhmlrof2cb.py
@@ -1,7 +1,8 @@
 # Used by:
-# Ships from group: Interdictor (4 of 4)
+# Ship: Raven
+# Ship: Widow
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Interdictors").level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Interdiction Sphere Launcher",
-                                  "speed", ship.getModifiedItemAttr("eliteBonusInterdictors2") * level)
+    level = fit.character.getSkill("Caldari Battleship").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Heavy",
+                                  "speed", ship.getModifiedItemAttr("shipBonus2CB") * level)
diff --git a/eos/effects/shipbonussmallmissileexplosionradiuscd2.py b/eos/effects/shipbonussmallmissileexplosionradiuscd2.py
new file mode 100644
index 000000000..89e393973
--- /dev/null
+++ b/eos/effects/shipbonussmallmissileexplosionradiuscd2.py
@@ -0,0 +1,7 @@
+# Used by:
+# Ship: Flycatcher
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Caldari Destroyer").level
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
+                                    "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCD2") * level)
diff --git a/eos/effects/shipbonusthermicshieldresistancecb2.py b/eos/effects/shipbonusthermicshieldresistancecb2.py
index f26a10ef1..c2fba8800 100755
--- a/eos/effects/shipbonusthermicshieldresistancecb2.py
+++ b/eos/effects/shipbonusthermicshieldresistancecb2.py
@@ -1,5 +1,4 @@
 # Used by:
-# Ship: Nestor
 # Ship: Rattlesnake
 # Ship: Rokh
 # Ship: Scorpion Navy Issue
diff --git a/eos/effects/shiphybridfalloff1gd1.py b/eos/effects/shiphybridfalloff1gd1.py
index 16107334d..130816ecc 100755
--- a/eos/effects/shiphybridfalloff1gd1.py
+++ b/eos/effects/shiphybridfalloff1gd1.py
@@ -1,5 +1,5 @@
 # Used by:
-# Variations of ship: Catalyst (7 of 7)
+# Variations of ship: Catalyst (6 of 7)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Gallente Destroyer").level
diff --git a/eos/effects/shiphybridoptimalgd1.py b/eos/effects/shiphybridoptimalgd1.py
new file mode 100644
index 000000000..f703820f3
--- /dev/null
+++ b/eos/effects/shiphybridoptimalgd1.py
@@ -0,0 +1,7 @@
+# Used by:
+# Ship: Eris
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Gallente Destroyer").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
+                                  "maxRange", ship.getModifiedItemAttr("shipBonusGD1") * level)
diff --git a/eos/effects/shipmissilevelocitypiratefactioncruise.py b/eos/effects/shipmissilevelocitypiratefactioncruise.py
index ec5470b3c..d5af7a255 100755
--- a/eos/effects/shipmissilevelocitypiratefactioncruise.py
+++ b/eos/effects/shipmissilevelocitypiratefactioncruise.py
@@ -1,5 +1,4 @@
 # Used by:
-# Ship: Nestor
 # Ship: Rattlesnake
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipmissilevelocitypiratefactiontorp.py b/eos/effects/shipmissilevelocitypiratefactiontorp.py
index cdd776324..52b86d0e7 100755
--- a/eos/effects/shipmissilevelocitypiratefactiontorp.py
+++ b/eos/effects/shipmissilevelocitypiratefactiontorp.py
@@ -1,5 +1,4 @@
 # Used by:
-# Ship: Nestor
 # Ship: Rattlesnake
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipscanprobestrengthbonuspiratecruiser.py b/eos/effects/shipscanprobestrengthbonuspiratecruiser.py
index 9803ee888..9fb9007de 100755
--- a/eos/effects/shipscanprobestrengthbonuspiratecruiser.py
+++ b/eos/effects/shipscanprobestrengthbonuspiratecruiser.py
@@ -1,7 +1,7 @@
 # Used by:
+# Ships named like: Stratios (2 of 2)
 # Ship: Astero
 # Ship: Gnosis
-# Ship: Stratios
 type = "passive"
 def handler(fit, container, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
diff --git a/eos/effects/shipshtdmgbonusgf.py b/eos/effects/shipshtdmgbonusgf.py
index 4a0cc72cb..675e21af8 100755
--- a/eos/effects/shipshtdmgbonusgf.py
+++ b/eos/effects/shipshtdmgbonusgf.py
@@ -1,8 +1,9 @@
 # Used by:
-# Variations of ship: Atron (3 of 3)
 # Variations of ship: Incursus (3 of 3)
+# Ship: Atron
 # Ship: Federation Navy Comet
 # Ship: Helios
+# Ship: Taranis
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Gallente Frigate").level
diff --git a/eos/effects/shipshtoptimalbonusgf.py b/eos/effects/shipshtoptimalbonusgf.py
new file mode 100644
index 000000000..1c8cb376b
--- /dev/null
+++ b/eos/effects/shipshtoptimalbonusgf.py
@@ -0,0 +1,7 @@
+# Used by:
+# Ship: Ares
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Gallente Frigate").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
+                                  "maxRange", ship.getModifiedItemAttr("shipBonusGF") * level)
diff --git a/eos/effects/shipsmallmissiledmgad1.py b/eos/effects/shipsmallmissiledmgad1.py
new file mode 100644
index 000000000..f023bcd12
--- /dev/null
+++ b/eos/effects/shipsmallmissiledmgad1.py
@@ -0,0 +1,8 @@
+# Used by:
+# Ship: Heretic
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Amarr Destroyer").level
+    for damageType in ("em", "thermal", "explosive", "kinetic"):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
+                                        "%sDamage" % damageType, ship.getModifiedItemAttr("shipBonusAD1") * level)
diff --git a/eos/effects/shipsmallmissiledmggf2.py b/eos/effects/shipsmallmissiledmggf2.py
deleted file mode 100644
index d0fe9d31b..000000000
--- a/eos/effects/shipsmallmissiledmggf2.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Used by:
-# Ship: Ares
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Gallente Frigate").level
-    damageTypes = ("em", "explosive", "kinetic", "thermal")
-    for damageType in damageTypes:
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-                                        "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusGF2") * level)
diff --git a/eos/effects/warpskillspeed.py b/eos/effects/warpskillspeed.py
index ff6d75891..4eae764aa 100755
--- a/eos/effects/warpskillspeed.py
+++ b/eos/effects/warpskillspeed.py
@@ -1,4 +1,5 @@
 # Used by:
+# Implants named like: Ascendancy (10 of 12)
 # Implants named like: Eifyr and Co. 'Rogue' Warp Drive Speed WS (6 of 6)
 # Modules named like: Hyperspatial Velocity Optimizer (8 of 8)
 type = "passive"
diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py
index a7e70fcb0..c25d11ca5 100755
--- a/eos/saveddata/module.py
+++ b/eos/saveddata/module.py
@@ -327,7 +327,12 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
 
     @property
     def reloadTime(self):
-        return self.__reloadTime
+        # Get reload time from attrs first, then use
+        # custom value specified otherwise (e.g. in effects)
+        moduleReloadTime = self.getModifiedItemAttr("reloadTime")
+        if moduleReloadTime is None:
+            moduleReloadTime = self.__reloadTime
+        return moduleReloadTime
 
     @reloadTime.setter
     def reloadTime(self, milliseconds):
diff --git a/service/market.py b/service/market.py
index d19c8cee2..df12ce4a5 100644
--- a/service/market.py
+++ b/service/market.py
@@ -187,7 +187,10 @@ class Market():
             "Cambion": self.les_grp, # AT10 prize
             "Etana": self.les_grp, # AT10 prize
             "Chremoas": self.les_grp, # AT11 prize :(
-            "Moracha": self.les_grp } # AT11 prize
+            "Moracha": self.les_grp, # AT11 prize
+            "Interbus Shuttle": self.les_grp,
+            "Leopard": self.les_grp,
+            "Stratios Emergency Responder": self.les_grp }
         self.ITEMS_FORCEGROUP_R = self.__makeRevDict(self.ITEMS_FORCEGROUP)
         self.les_grp.addItems = list(self.getItem(itmn) for itmn in self.ITEMS_FORCEGROUP_R[self.les_grp])
         self.customGroups.add(self.les_grp)
@@ -222,7 +225,16 @@ class Market():
             "Goru's Shuttle": False, # Vanity
             "Guristas Shuttle": False, # Vanity
             "Tash-Murkon Magnate": False, # Vanity
-            "Scorpion Ishukone Watch": False } # Vanity
+            "Scorpion Ishukone Watch": False, # Vanity
+            "Festival Launcher": False, # Celebration-related item
+            "Barium Firework CXIV": False, # Celebration-related item
+            "Copper Firework CXIV": False, # Celebration-related item
+            "Sodium Firework CXIV": False, # Celebration-related item
+            "Snowball CXIV": False, # Celebration-related item
+            "Barium Firework": False, # Celebration-related item
+            "Copper Firework": False, # Celebration-related item
+            "Sodium Firework": False, # Celebration-related item
+            "Snowball": False } # Celebration-related item
 
         # List of groups which are forcibly published
         self.GROUPS_FORCEPUBLISHED = {
diff --git a/staticdata/eve.db b/staticdata/eve.db
index 3a30180f6..86a5e1895 100644
Binary files a/staticdata/eve.db and b/staticdata/eve.db differ
diff --git a/staticdata/icons/ships/33468.png b/staticdata/icons/ships/33468.png
index 7a6093e51..9f0438571 100644
Binary files a/staticdata/icons/ships/33468.png and b/staticdata/icons/ships/33468.png differ
diff --git a/staticdata/icons/ships/33470.png b/staticdata/icons/ships/33470.png
index 6ab077306..004e84839 100644
Binary files a/staticdata/icons/ships/33470.png and b/staticdata/icons/ships/33470.png differ
diff --git a/staticdata/icons/ships/33472.png b/staticdata/icons/ships/33472.png
deleted file mode 100644
index 9a6087ac3..000000000
Binary files a/staticdata/icons/ships/33472.png and /dev/null differ
diff --git a/staticdata/icons/ships/33513.png b/staticdata/icons/ships/33513.png
new file mode 100644
index 000000000..3ce19094c
Binary files /dev/null and b/staticdata/icons/ships/33513.png differ
diff --git a/staticdata/icons/ships/33553.png b/staticdata/icons/ships/33553.png
new file mode 100644
index 000000000..56e17efba
Binary files /dev/null and b/staticdata/icons/ships/33553.png differ