diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex
index dbf4ce08..9382be76 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 cd0d7b01..5f2ea4a8 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 4ff85dc5..945ecbf2 100644
--- a/mpq/arr/weapons.txt
+++ b/mpq/arr/weapons.txt
@@ -149,7 +149,7 @@ Cerberus Railgun (Sentinel)
 Vapid Blaster (Vagrant)
 Khaydarin Ray (Matrix)
 Blindside Rockets (Sundog)
-Twinstrike Cannons (Matador)
+Twinstrike Flamethrowers (Matador)
 Bisecting Blades (Zarcavrokor)
 Bones of Reflection (Zarcavrokor)
 Retractor Batteries (Pegasus)
diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft
index d46b89bd..aede894c 100644
Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ
diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl
index 4d52cf37..ca6fa92b 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 67f51dba..c5de25f6 100644
--- a/mpq/scripts/iscript.txt
+++ b/mpq/scripts/iscript.txt
@@ -46745,10 +46745,15 @@ MatadorGndAttkInit:
 	nobrkcodestart
 	playfram          	0x100
 	playsndbtwn			2161 2163 # Matador weaponfire 01, 02, 03
-	attackwith        	1
-	wait				1
+	imgol             	421 0 0 # FlameThrower (thingy\flamer.grp)
+	attkshiftproj     	24
+	wait              	1
+	attkshiftproj     	52
+	wait              	1
+	attkshiftproj     	80
+	wait              	3
 	playfram          	0x00
-	wait				1
+	wait				3
 	nobrkcodeend
 	gotorepeatattk
 	goto              	MatadorGndAttkToIdle
@@ -47696,15 +47701,24 @@ EpigraphDeath:
 EpigraphGndAttkInit:
 	nobrkcodestart
 	playsndbtwn       	1926 1928 # Epigraph weaponfire 01, 02, 03
+	playfram			0x20
+	attackwith        	1
+	wait              	1
 	playfram			0x00
+	wait              	1
+	playfram			0x40
 	attackwith        	1
-	wait              	2
+	wait              	1
+	playfram			0x00
+	wait              	1
+	playfram			0x60
 	attackwith        	1
-	wait              	2
+	wait              	1
+	playfram			0x00
+	wait              	1
+	playfram			0x80
 	attackwith        	1
-	wait              	2
-	attackwith        	1
-	wait              	2
+	wait              	1
 	playfram			0x00
 	nobrkcodeend
 	gotorepeatattk
diff --git a/patchnotes.md b/patchnotes.md
index 88acb83b..088f63b7 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -3,7 +3,11 @@
 ## Designer's Notes
 We will revise reclamation (and other corpse interactions), as well as Vulture mine-laying.
 
-We have also increased worker training times as another means of testing a slower scaling for the early-game. It should also help to leave more room for "flow" inside early build orders, while increasing the value of parallel worker queues.
+We have increased worker training times as another means of testing a slower scaling for the early-game. It should also help to leave more room for "flow" inside early build orders, while increasing the value of parallel worker queues.
+
+A stat adjustment has occurred with the aim of creating a game state with higher time-to-kill than what has hitherto been seen within Cosmonarchy Brood War. We believe this shift will create a less-volatile game at all stages of all matchups, and allow for individual mistakes to be less about losing the game and more about ceding advantages to your opponent - which will, of course, eventually lose you the game!
+
+Just like every other large-scale change we have attempted recently, this will be tinkered with and evaluated over time, but we are excited to achieve a game state that allows for more measured play and less coin-flip interactions. Stay tuned!
 
 ## Gameplay
 - During construction, Masons and Taloses now move in a predictable pattern (c. DarkenedFantasies)
@@ -29,6 +33,7 @@ We have also increased worker training times as another means of testing a slowe
 - Terran lifted buildings now play the "base is under attack" notification
 - Replays are now auto-saved (c. Veeq7)
 - Team UI now has a config option for showing your own stats in the same style, defaulting to off (c. Veeq7)
+- A new emoji has been added to the font (c. DarkenedFantasies)
 
 ## Terran
 - Mason:
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index 304c352f..78195808 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ