diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex
index 27026b3b..d836a86c 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 c3d07948..3bf076ca 100644
--- a/mpq/arr/flingy.txt
+++ b/mpq/arr/flingy.txt
@@ -220,7 +220,7 @@ Scrapyard
 Rotary
 Sundog
 Azazel
-Matador
+Matador (Tank Mode)
 Gorgrokor
 Starpad
 Aurora
diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex
index c4025a87..11aa8e5c 100644
Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ
diff --git a/patchnotes.md b/patchnotes.md
index a38bccc1..daac1dbd 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -7,6 +7,9 @@ Download [Fraud Launcher 2](https://fraudsclub.com/files/Fraud%20Launcher%202.zi
 
 We are still hunting for desyncs! Please submit your critical logs to cm-issues on [our Discord server](https://discord.com/invite/s5SKBmY).
 
+## Patch summary
+Forthcoming.
+
 ## Internals
 - Cleaned up some sound randomization, which may have contributed to sync issues
 - Prospectively fixed 'debug' being the default game mode on first run
@@ -99,10 +102,16 @@ We are still hunting for desyncs! Please submit your critical logs to cm-issues
 - [Eidolon](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/eidolon):
 	- Mineral cost now 50, from 75
 - [Cyclops](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cyclops):
-	- HP now 90, from 85
+	- Mineral cost now 75, from 100
+	- *Personally, I quite fear the Cyclops meta.*
 - [Blackjack](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/blackjack):
 	- Mineral cost now 100, from 125
 	- HP now 75, from 85
+- [Matador](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/matador):
+	- Turn rate now 16, from 24
+	- Now moves 25% faster
+- [Phalanx](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/phalanx):
+	- Turn rate now 16, from 10
 - [Tinkerer's Tower](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/tinkerers-tower):
 	- Gas cost now 75, from 100
 - [Salamander](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/salamander):
@@ -114,6 +123,10 @@ We are still hunting for desyncs! Please submit your critical logs to cm-issues
 - [Paladin](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/paladin):
 	- Splash radii now 24/48/72, from 12/24/48
 	- Missiles now move notably faster
+- [Scrapyard](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/scrapyard):
+	- Time cost now 15, from 20
+- [Palladium](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/palladium):
+	- Time cost now 25, from 30
 
 ## Protoss
 - [Legionnaire](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/legionnaire):
@@ -123,18 +136,22 @@ We are still hunting for desyncs! Please submit your critical logs to cm-issues
 	- Shields now 40, from 20
 - [Pariah](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/pariah):
 	- Now blocks titanic movement (e.g. Penumbra, Optecton)
+- [Archon](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/archon):
+	- Mineral cost now 350, from 500
+	- Armor now 3, from 4
+- [Optecton](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/optecton):
+	- Mineral, gas, and time costs now 500/250/60, from 450/200/50
+	- Collision size now significantly larger
+	- No longer collides with small units
+	- Turn rate now 10, from 40
+	- Now moves ~14% faster
+	- Transport space cost now 20, from 8
+	- Skybond Ray weapon removed
 - [Patriarch](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/patriarch):
 	- HP now 180, from 200
 	- Armor now 3, from 4
 	- Weapon splash radius now 9/18/36, from 12/24/48
 	- Astral Rule no longer Ascends victims
-- [Optecton](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/optecton):
-	- Gas and time costs now 250/60, from 200/50
-	- Collision size now significantly larger
-	- No longer collides with small units
-	- Now moves ~14% faster
-	- Transport space cost now 20, from 8
-	- Skybond Ray weapon removed
 - [Demiurge](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/demiurge):
 	- Worship:
 		- No longer seizes hostile units
@@ -158,9 +175,12 @@ We are still hunting for desyncs! Please submit your critical logs to cm-issues
 	- Shields now 400, from 500
 	- Build area now 4x4, from 5x4
 - [Ancestral Archives](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/ancestral-archives):
+	- Mineral and time costs now 800/75, from 600/70
 	- HP now 900, from 600
 	- Armor now 5, from 4
 	- Build area now 5x4, from 3x2
+- [Synthetic Synod](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/synthetic-synod):
+	- Mineral, gas, and time costs now 600/600/75, from 500/500/70
 
 ## Zerg
 - [Vorvrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/vorvrokor):
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index c17344ed..111ec765 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ