diff --git a/CMBW-maps/melee/2v2/(4)Parabola.scx b/CMBW-maps/melee/2v2/(4)Parabola.scx
index e974c790..296ee489 100644
Binary files a/CMBW-maps/melee/2v2/(4)Parabola.scx and b/CMBW-maps/melee/2v2/(4)Parabola.scx differ
diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex
index 036b3e33..a5ccc4ef 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 696963b9..c854a2cd 100644
Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ
diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft
index e715cfab..3e8c7189 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 cd7832b9..3c0120c1 100644
Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ
diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin
index 8be564e7..faf2e296 100644
Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ
diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt
index 1a54f595..ca42fb3e 100644
--- a/mpq/scripts/iscript.txt
+++ b/mpq/scripts/iscript.txt
@@ -34439,6 +34439,7 @@ IonCannonBaseGndAttkInit:
 	playfram          	0x40
 IonCannonBaseGndAttkRpt:
 	nobrkcodestart
+	sigorder			32
 	playsnd           	1319 # ioncannon-charge-01
 	wait              	71
 	attackwith			1
diff --git a/patchnotes.md b/patchnotes.md
index 8040c30c..f3f6ba77 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -7,25 +7,39 @@ Continuing March Madness into April, tweaking the economic pacing some more, and
 - Harvest time now 4 seconds, from 4.8
 - Worker movement speeds now 10% faster
 
+## Gameplay
+- Burrowed units are no longer forcibly unburrowed when attacked (c. DarkenedFantasies)
+
 ## Bugfixes
-- Maelstrom hits from dead Mind Tyrants no longer crash
+- Maelstrom hits from dead Mind Tyrants no longer crash (c. Veeq7)
 - Burrowed units are no longer displaced by Striga Fleeting Focus or Magnetar Law of Attraction
+- Player color randomization now ignores the colors of witness players (c. Veeq7)
 
 ## AI
 - Production and attack logic has been cleaned up to be more sensible with the current economic state
 - AI "drip-feed" attack waves less often
+- Zerg AI now request advanced defenses when at tier 2 and beyond
 
 ## Terran
+- [Heracles](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/heracles):
+	- HP now 140, from 120
+	- Armor now 4, from 3
+	- Weapon damage now 2x14, from 2x10
+	- Armor penetration now 0, from 4
+	- Nemean Reactors removed
 - [Apostle](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/apostle):
 	- Gas cost now 150, from 125
 - [Treasury](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/treasury):
 	- Time cost now 50, from 45
 - [Ion Cannon](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/ion-cannon):
 	- Mineral cost now 1000, from 800
+	- Now fires at target's initial position (still very WIP, needs reads)
 
 ## Protoss
 - [Charlatan](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/charlatan):
 	- Gas cost now 150, from 175
+- [Optecton](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/optecton):
+	- Splash type now ally-safe, from unsafe
 - [Panoptus](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/panoptus):
 	- Acceleration and halt distance now match the Aurora
 
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index e2616634..e76e8eec 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ