diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat
index 8334e427..cb3d2f9e 100644
Binary files a/mpq/arr/sfxdata.dat and b/mpq/arr/sfxdata.dat differ
diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt
index f00acda1..912fd631 100644
--- a/mpq/arr/sfxdata.txt
+++ b/mpq/arr/sfxdata.txt
@@ -3238,8 +3238,8 @@ Zerg Construction 02
 Zerg Construction 03
 Zerg Construction Start 01
 Broodspawn Overlay Proc
-Extended Sound #1
-Extended Sound #1
+Terran Construction End 01
+Terran Construction Start 01
 Extended Sound #1
 Extended Sound #1
 Extended Sound #1
diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt
index 611626fc..aa86d10c 100644
--- a/mpq/arr/sounds.txt
+++ b/mpq/arr/sounds.txt
@@ -3237,4 +3237,6 @@ cm\z\_building\z-construction-01.wav
 cm\z\_building\z-construction-02.wav
 cm\z\_building\z-construction-03.wav
 cm\z\_building\z-construction-start-01.wav
-Zerg\BROODLING\ZBrPss02.WAV
\ No newline at end of file
+Zerg\BROODLING\ZBrPss02.WAV
+cm\t\_building\t-construction-end-01.wav
+cm\t\_building\t-construction-start-01.wav
\ No newline at end of file
diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin
index 5f8e71bf..2eab68f0 100644
Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ
diff --git a/mpq/sound/cm/t/_building/t-construction-end-01.wav b/mpq/sound/cm/t/_building/t-construction-end-01.wav
new file mode 100644
index 00000000..14ebbc89
Binary files /dev/null and b/mpq/sound/cm/t/_building/t-construction-end-01.wav differ
diff --git a/mpq/sound/cm/t/_building/t-construction-start-01.wav b/mpq/sound/cm/t/_building/t-construction-start-01.wav
new file mode 100644
index 00000000..2159b496
Binary files /dev/null and b/mpq/sound/cm/t/_building/t-construction-start-01.wav differ
diff --git a/patchnotes.md b/patchnotes.md
index 3c56bcb3..8fb8c7bb 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -47,6 +47,7 @@ Forthcoming.
 	- **Hypnagogue** - **Through the Looking Glass**:
 		- No longer flips allied positions (r. GreenEggs'NSpam, c. Veeq7)
 		- No longer fails to teleport Hypnagogue when solo (r. GreenEggs'NSpam)
+	- Added attack buttons to weaponless units, to enable attack-move while multi-selected (r. SmrtyCakes)
 	- Lardfix: **Lakizilisks** can now attack while in a garrison
 	- In **Massacre** mode, cancelling a Zerg structure no longer gives vespene (r. Btyb)
 	- **Pazuzu**s now correctly respond to threats while on hold position (r. Kenoli)
@@ -61,6 +62,8 @@ Forthcoming.
 	- **Luminary** - **Aural Assault**
 		- Now properly casts on structures (r. Hamster)
 		- Now properly casts on terrain
+- **AI:**
+	- Fixed some Terran AI builds requesting too many addons, causing a softlock
 - **Audiovisuals:**
 	- **Vengeance** no longer creates overlyas on stationary structures
 	- Fixed bad cropping on **Zethrokor** and **Quazilisk** burrow graphics
@@ -76,12 +79,13 @@ Forthcoming.
 ## Audiovisuals
 - New ambient event SFX for:
 	- Terran worker-based construction
+	- Terran construction initiation & completion
 	- Terran repairs
 	- Protoss structure warp-in progression
-	- Protoss structure completion
+	- Protoss construction completion
 	- Zerg Egg hatch
 	- Zerg structure progression
-	- Zerg structure completion
+	- Zerg construction initiation & completion
 - New unit responses for:
 	- Durendal, Cataphract
 - New weaponhit SFX for:
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index 19241505..85af949b 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ