diff --git a/CMBW-maps/melee/1v1/Competitive Pool/(2)Infinite Velocity.scx b/CMBW-maps/melee/1v1/Competitive Pool/(2)Infinite Velocity.scx
index 4a7b5137..76380d96 100644
Binary files a/CMBW-maps/melee/1v1/Competitive Pool/(2)Infinite Velocity.scx and b/CMBW-maps/melee/1v1/Competitive Pool/(2)Infinite Velocity.scx differ
diff --git a/CMBW-maps/melee/2v2/Needs Testing/(4)Tomb World.scx b/CMBW-maps/melee/2v2/Needs Testing/(4)Tomb World.scx
new file mode 100644
index 00000000..0eb3f928
Binary files /dev/null and b/CMBW-maps/melee/2v2/Needs Testing/(4)Tomb World.scx differ
diff --git a/CMBW-maps/melee/FFA Solo/(5)Magmaticus.scx b/CMBW-maps/melee/FFA Solo/(5)Magmaticus.scx
index e38780d0..46e9aa58 100644
Binary files a/CMBW-maps/melee/FFA Solo/(5)Magmaticus.scx and b/CMBW-maps/melee/FFA Solo/(5)Magmaticus.scx differ
diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex
index 4c94ba15..2c45c8ec 100644
Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ
diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl
index f90e21c2..3f777868 100644
Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ
diff --git a/patchnotes.md b/patchnotes.md
index 4168ff8f..69db27e6 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -26,7 +26,9 @@ Patch goals include:
 	- Sycophants no longer "donate" shields for free (r. Mystery Meat)
 	- Ascending corpses now enchants allies instead of enemies
 	- Cagra spread by Omnivales now correctly recedes when the Omnivale dies (r. Btyb88)
-	- Fixed default hotkey collisions for Larvosk and Ocsal Cesiants (r. neblime)
+	- Fixed default hotkey collisions for: (r. neblime)
+		- Larvosk Cesiant: Control Strains and Ocsal aspect
+		- Argosy: Epigraph and Empyrean
 - AI:
 	- Fixed request processing for Alkajelisks
 	- Zerg AI no longer overbuild Ovileths in the early game
@@ -42,12 +44,29 @@ Patch goals include:
 - [Talos](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/talos):
 	- Now trained from Quarry
 	- Now moves ~16.5% faster
+- [Sundog](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/sundog):
+	- Time cost now 35, from 30
+	- 
+- []():
+	- Time cost now 35, from 30
+	- HP now 175, from 180
 - [Pythean](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/pythean):
 	- Now trained from Nanite Assembly
 - [Quarry](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/quarry):
 	- Gas cost now 75, from 50
 - Parthenon:
 	- Removed
+- [Stockade](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/stockade):
+	- Time cost now 40, from 35
+- [Mantle](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/mantle):
+	- Time cost now 45, from 40
+- [Starport](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/starport):
+	- Gas and time costs now 150/50, from 125/45
+- [Rotary](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/rotary):
+	- Mineral and time costs now 200/35, from 125/20
+	- HP now 750, from 700
+- [Commandment](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/commandment):
+	- Gas and time costs now 150/35, from 125/25
 
 ## Protoss
 - [Artisan](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/artisan):
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index e6d16756..76c1a251 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ