diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex
index db69482e..2f2cc510 100644
Binary files a/mpq/arr/flingy.datex and b/mpq/arr/flingy.datex differ
diff --git a/mpq/arr/flingy.txt b/mpq/arr/flingy.txt
index e779c8ad..db4cd438 100644
--- a/mpq/arr/flingy.txt
+++ b/mpq/arr/flingy.txt
@@ -80,12 +80,12 @@ Maverick
 Scanner Sweep
 Wraith
 Mason
-Siege Tank (Tank) Base
-Siege Tank (Tank) Turret
-Siege Tank (Siege) Base
-Siege Tank (Siege) Turret
-Science Vessel (Base)
-Science Vessel (Turret)
+Phalanx (Tank) Base
+Phalanx (Tank) Turret
+Phalanx (Siege) Base
+Phalanx (Siege) Turret
+Seraph (Base)
+Seraph (Turret)
 Vulture
 Spider Mine
 Fountainhead
diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex
index 83b8b03b..cdcc5a5a 100644
Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ
diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex
index 6d87314a..1c0deb93 100644
Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ
diff --git a/mpq/arr/weapons.txt b/mpq/arr/weapons.txt
index c61ff050..68c183b2 100644
--- a/mpq/arr/weapons.txt
+++ b/mpq/arr/weapons.txt
@@ -93,7 +93,7 @@ Intervention Missiles (Star Sovereign behavior)
 Spores (Sovroleth)
 Flak Cannons (Cyclops)
 Argos Laser Batteries (Phobos)
-Sowing Spines (Konvilisk)
+Sowing Spores (Konvilisk)
 Charybdal Rifle (Siren)
 Astral Blaster (Ecclesiast)
 Dauntless Disruption Cannon (Atreus)
@@ -169,7 +169,7 @@ Rapid Spines (Zobriolisk)
 Fusion Saw (Wendigo)
 Knockout Drivers (Southpaw)
 Pharoah Cannons (Ramesses)
-Fist of Abaddon (Durendal)
+Abaddon Flamethrower (Durendal)
 Philistine Autogun (Durendal)
 Longinius Cannons (Cataphract)
 Upstart Rifle (Dilettante)
diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl
index 39193379..f888f2f6 100644
Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ
diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt
index 12460985..8cca66c5 100644
--- a/mpq/scripts/iscript.txt
+++ b/mpq/scripts/iscript.txt
@@ -49521,12 +49521,17 @@ DurendalGndAttkInit:
 	playfram			0x240
 	wait				1
 	playfram			0x260
-	attackmelee			3 1577 1578 1579 # Olympian Melee 01, 02, 03
-	wait				2
+	playsndbtwn			1577 1579 # Olympian Melee 01, 02, 03
+	playsndbtwn			2161 2163 # Matador weaponfire 01, 02, 03
+	imgol             	421 0 0 # FlameThrower (thingy\flamer.grp)
+	attkshiftproj     	24
+	wait              	1
 	playfram			0x280
-	wait				1
+	attkshiftproj     	52
+	wait              	1
 	playfram			0x2A0
-	wait				1
+	attkshiftproj     	80
+	wait              	1
 	playfram			0x2C0
 	wait				1
 	playfram			0x2E0
diff --git a/patchnotes.md b/patchnotes.md
index 95b2d619..1a34746e 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -143,17 +143,33 @@ Just like every other large-scale change we have attempted recently, this will b
 - [Phalanx](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/phalanx):
 	- HP now 180, from 150
 	- Now moves 10% slower
+	- Now turns ~23% slower
 	- Arclite Shock Cannon:
-		- 
+		- Now fires a projectile without following the target
 	- Babylon Plating now gives 4 armor to Tank Mode and 0 armor to Siege Mode
 - [Madrigal](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/phalanx):
 	- Armor now 1, from 2
 	- Furia Missiles:
 		- Armor penetration now 0, from 1
 		- Cooldown now 1 second, from 0.916
-- [Ramesses]():
+- [Ramesses](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/ramesses):
+	- Mineral cost now 200, from 225
+	- HP now 100, from 120
+	- Armor now 1, from 2
 	- Armor penetration now 2, from 4
+	- Weapon cooldown now 0.916, from 0.833
 	- Weapon now benefits from Prolonged Arms
+	- Weapon no longer splashes
+- [Durendal](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/durendal):
+	- HP now 200, from 180
+	- Armor now 3, from 4
+	- Weapon rework (primary):
+		- Now uses a flamethrower attack which applies Apollyoid Adhesive
+- [Cataphract](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cataphract):
+	- HP now 300, from 200
+	- Armor now 3, from 4
+	- Armor penetration now 1, from 2
+	- Weapon range now 8, from 9
 - [Wraith](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/wraith):
 	- Mineral cost now 75, from 100
 	- HP now 100, from 90
@@ -165,6 +181,34 @@ Just like every other large-scale change we have attempted recently, this will b
 	- Mineral cost now 75, from 100
 - [Trojan](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/trojan):
 	- HP now 125, from 150
+- [Gorgon](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/gorgon):
+	- Now moves ~12.5% slower
+	- Armor penetration now 2, from 4
+	- Weapon range now 5, from 6
+- [Wyvern](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/wyvern):
+	- HP now 200, from 175
+	- Weapon cooldown now 1.5, from 1.25
+	- Now moves ~22% faster
+- [Valkyrie](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/valkyrie):
+	- HP now 180, from 200
+	- Armor now 2, from 4
+	- Weapon damage now 2x8, from 2x10
+	- Weapon cooldown now 1, from 0.916
+	- Weapon range now 6, from 8
+- [Sundog](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/sundog):
+	- Armor now 1, from 2
+	- Armor penetration now 0, from 2
+- [Salamander](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/salamander):
+	- Armor now 2, from 3
+	- Now moves ~8% slower
+	- Armor penetration now 0, from 3
+	- Weapon range now 6, from 7
+- [Azazel](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/azazel):
+	- Armor now 2, from 3
+- [Seraph](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/seraph):
+	- HP now 250, from 225
+	- Armor now 2, from 4
+	- Now moves ~17% slower
 - [Watchdog](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/watchdog):
 	- Armor penetration now 0, from 2
 - [Sentinel](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/sentinel):
@@ -204,6 +248,31 @@ Just like every other large-scale change we have attempted recently, this will b
 	- Shields now 70, from 80
 	- Armor now 1, from 2
 	- Weapon damage now 8, from 10
+- Amaranth:
+	- HP now 120, from 100
+	- Shields now 40, from 50
+	- Weapon damage now 2x8, from 2x10
+	- Armor penetration now 1, from 3
+	- Weapon cooldown now 1, from 0.916
+- Herald:
+	- Mineral cost now 150, from 200
+	- Shields now 40, from 60
+	- Armor now 3, from 4
+	- Now moves ~17% faster
+	- Armor penetration now 3, from 4
+- Atreus:
+	- HP now 140, from 120
+	- Weapon damage now 10, from 20
+	- Armor penetration now 2, from 4
+	- Weapon cooldown now 0.75, from 1.25
+	- Weapon range now 8, from 7
+- Cabalist:
+	- HP now 90, from 80
+	- Armor now 1, from 2
+	- Weapon cooldown now 1.416, from 1.333
+- Barghest:
+	- Armor penetration now 0, from 1
+	- Weapon cooldown now 1, from 0.916
 - Simulacrum:
 	- No longer 2 per requisition
 	- Mineral and time costs now 75/15, from 125/22
@@ -236,7 +305,22 @@ Just like every other large-scale change we have attempted recently, this will b
 	- Armor now 1, from 2
 	- Armor penetration now 2, from 1
 	- Weapon cooldown now 1, from 0.916
+- Servitor:
+	- No longer 2 per requisition
+	- Mineral and time costs now 100/20, from 200/25
+	- HP now 80, from 60
+	- Armor now 1, from 2
+	- Armor penetration now 3, from 5
+- Positron:
+	- HP now 120, from 90
+	- Shields now 40, from 50
+	- Armor now 2, from 3
+	- Armor penetration now 0, from 2
 - Architect:
+	- HP now 180, from 200
+	- Armor now 3, from 4
+	- Now moves ~12.5% faster
+	- Armor penetration now 0, from 5
 	- Weapon range now 10, from 8
 - Aurora:
 	- Shields now 50, from 30
@@ -253,8 +337,33 @@ Just like every other large-scale change we have attempted recently, this will b
 	- Weapon damage now 2x12, from 2x14
 	- Armor penetration now 0, from 4
 	- Weapon cooldown now 1.166, from 1
+- Magister:
+	- HP now 180, from 200
+	- Armor now 2, from 3
+	- Weapon damage now 15, from 18
+	- Armor penetration now 0, from 4
+	- Weapon cooldown now 1, from 0.75
+	- Weapon range now 6, from 7
+- Epigraph:
+	- Armor now 3, from 4
+	- Now moves ~18% slower
+	- Armor penetration now 2, from 4
+	- Weapon range now 8, from 9
+- Didact:
+	- Shields now 60, from 100
+	- Weapon removed
+- Gladius:
+	- HP now 110, from 120
+	- Shields now 90, from 70
+	- Armor now 1, from 2
+	- Weapon cooldown now 1.416, from 1.333
+- Exemplar:
+	- Armor now 3, from 4
+	- Now moves ~10% slower
+	- Armor penetration now 0, from 6
+	- Weapon cooldown now 1.083, from 0.916
 - [Warden](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/warden):
-	- Armor penetration now 0, from 
+	- Armor penetration now 0, from 2
 
 ## Zerg
 - [Larva](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/larva):
@@ -276,8 +385,27 @@ Just like every other large-scale change we have attempted recently, this will b
 	- Armor now 0, from 1
 	- Armor penetration now 1, from 2
 	- Weapon cooldown now 0.583, from 0.5
+- Liiralisk:
+	- Armor penetration now 0, from 2
+- Kalkalisk:
+	- HP now 90, from 85
+	- Armor now 1, from 3
+	- Armor penetration now 2, from 4
+	- Weapon range now 6, from 7
+- Cikralisk:
+	- HP now 75, from 65
+	- Armor now 0, from 1
+	- Armor penetration now 1, from 2
+- Protathalor:
+	- Armor now 2, from 3
+	- Weapon cooldown now 1.25, from 1.166
+- Mutalisk:
+	- Now 2 per requisition
+	- Mineral and time costs now 200/25, from 100/20
+	- Armor now 1, from 2
+	- Armor penetration now 2, from 3
 - Hydralisk:
-	- HP now 85, from 80
+	- HP now 90, from 80
 	- Armor now 1, from 2
 	- Armor penetration now 2, from 4
 	- Weapon cooldown now 0.708, from 0.625
@@ -289,6 +417,30 @@ Just like every other large-scale change we have attempted recently, this will b
 	- HP now 120, from 100
 	- Weapon cooldown now 0.75, from 0.54
 	- Weapon range now 2, from 3
+- Bactalisk:
+	- Mineral cost now 75, from 50
+	- HP now 120, from 100
+- Tethzorokor:
+	- Armor now 3, from 4
+	- Armor penetration now 3, from 4
+	- Weapon cooldown now 0.75, from 0.666
+- Vithrilisk:
+	- Mineral cost now 150, from 125
+	- Armor now 2, from 3
+	- Armor penetration now 0, from 5
+	- Weapon range now 5, from 7
+- Kagralisk:
+	- HP now 110, from 100
+	- Weapon cooldown now 1.333, from 1.25
+- Evigrilisk:
+	- HP now 260, from 240
+	- Armor now 3, from 4
+	- Armor penetration now 2, from 4
+	- Weapon range now 4, from 5
+- Almaksalisk:
+	- Armor now 1, from 2
+	- Armor penetration now 3, from 6
+	- Weapon cooldown now 0.75, from 0.708
 - Zoryusthaleth:
 	- HP now 240, from 200
 	- Armor now 2, from 4
@@ -302,6 +454,25 @@ Just like every other large-scale change we have attempted recently, this will b
 	- Armor now 2, from 3
 	- Armor penetration now 1, from 4
 	- Weapon cooldown now 0.416, from 0.375
+- Konvilisk:
+	- HP now 160, from 150
+	- Armor now 2, from 3
+	- Now moves ~10% slower
+	- Armor penetration now 0, from 3
+	- Weapon cooldown now 1.25, from 0.5
+	- Weapon range now 6, from 7
+	- Weapon now splashes in 0.5/0.75/1 range radii
+- Vilgorokor:
+	- Armor now 3, from 4
+	- Armor penetration now 0, from 5
+- Matraleth:
+	- Armor now 1, from 2
+- Rililisk:
+	- Armor penetration now 0, from 2
+- Surkith Colony:
+	- Weapon cooldown now 0.708, from 0.666
+- Skortrith Colony:
+	- Weapon cooldown now 1, from 0.75
 - Izkag Iteth:
 	- Now requires Irol Iris
 - Matravil Nest:
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index 322f874d..f49f877b 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ