diff --git a/CMBW-maps/melee/1v1/Needs Testing/(2)Swampside.scm b/CMBW-maps/melee/1v1/Needs Testing/(2)Swampside.scm
index 42ff403c..0541c68c 100644
Binary files a/CMBW-maps/melee/1v1/Needs Testing/(2)Swampside.scm and b/CMBW-maps/melee/1v1/Needs Testing/(2)Swampside.scm differ
diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex
index 2d055c97..8c998d79 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 f7ee2dc2..f8c2f987 100644
Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ
diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl
index a1b20913..443d6059 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 29a20470..f08eb8fd 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -37,10 +37,30 @@ Patch goals include:
 	- Fixed a rare issue with Olympians becoming unresponsive when moving after a melee attack (r. lolrsk8s)
 
 ## Terran
+- [Savant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/savant):
+	- Armor now 2, from 1
+	- No longer has energy
+	- Entropy Gauntlets now always provides Kinetic Penetration
+- [Madcap](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/madcap):
+	- Cabeirus Feeders now provides 15% attack speed per stack, from ~10%
 - [Vulture](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/vulture):
 	- HP now 85, from 90
 	- Now moves 6.25% faster
 	- Now visibly shoots two projectiles for better visual clarity
+- [Cataphract](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cataphract):
+	- Weapon range now 9, from 8
+- [Gorgon](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/gorgon):
+	- Weapon cooldown now 0.79, from 0.83
+- [Azazel](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/azazel):
+	- Defensive Matrix:
+		- Timer now 10 seconds, from 30
+		- Heal now 10 HP per second, from 5
+- [Magnetar](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/magnetar):
+	- Max energy now 150, from 250
+- [Fountainhead](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/fountainhead):
+	- Mineral, gas, and time costs now 250/500/45, from 200/400/30
+- [Tinkerer's Tower](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/tinkerers-tower):
+	- Mineral and gas costs now 100/50, from 75/75
 
 ## Zerg
 - [Nathrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/nathrokor):
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index f251423b..cc95f6c7 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ