diff --git a/CMBW-maps/melee/3v3/(6)Waterloo.scx b/CMBW-maps/melee/3v3/(6)Waterloo.scx
index 12a2819e..ba92a13a 100644
Binary files a/CMBW-maps/melee/3v3/(6)Waterloo.scx and b/CMBW-maps/melee/3v3/(6)Waterloo.scx differ
diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex
index ea6cb0ac..e701e638 100644
Binary files a/mpq/arr/flingy.datex and b/mpq/arr/flingy.datex differ
diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex
index b4102b20..22b6e487 100644
Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ
diff --git a/patchnotes.md b/patchnotes.md
index c0c6589a..c3466480 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -1,4 +1,4 @@
-# 6 August 2023 -- prospective patch notes
+# 15 August 2023 -- prospective patch notes
 
 ## Designer's Notes
 
@@ -20,7 +20,7 @@ More rebalancings, more new sprites, more bugfixes, and a more useful patch desc
 - It is now possible to train Scribes when selecting Nexuses and Embassies together
 - Added a new config option for always showing condensed selections (c. DF)
 - It is now possible to select multiple units when in replays (c. DF)
-- When holding shift (or when config - always_show_extended_tooltips is set to true), weapon tooltips now display approximate ranges with a circle
+- When holding shift (or when config - always_show_extended_tooltips is set to true), weapon tooltips now display approximate ranges and minimum ranges with a circle
 	- This is **not** 100% consistent with weapon ranges; we will improve this feature in time!
 
 ## Audiovisuals:
@@ -32,10 +32,12 @@ More rebalancings, more new sprites, more bugfixes, and a more useful patch desc
 	- Diadem
 - New weaponfire SFX:
 	- Silvertongue
+- New config options for advisors have surfaced! (with help from Veeq7)
+	- These are **not** yet fully-implemented, so changing from the default values will result in a rather schizophrenic experience until more hooks are completed!
 
 ## Bugfixes
 - Stability:
-	- Fixed another nullsprite crash (r. Alexhandr)
+	- Fixed more nullsprite crashes (r. Alexhandr, The Shambler)
 	- Fixed a few crashes related to removing units via triggers (r. StratosTygo)
 - Gameplay:
 	- Structures can no longer spawn trained units on different height levels based on rally point (c. Veeq7)
@@ -43,6 +45,7 @@ More rebalancings, more new sprites, more bugfixes, and a more useful patch desc
 	- Hippogriffs no longer miss their target while at max range (c. Veeq7)
 	- Landing structures can no longer teleport to map bounds in rare cases (r. StratosTygo & fagguto)
 	- Anciles no longer protect against friendly "go to max range" projectiles when those projectiles kill their target
+	- Rilirokor corpses can no longer be used for Broodspawn effects (r. neblime & The Shambler)
 	- Anthelions can no longer damage undetected hidden enemies (r. IskatuMesk)
 	- Ensnaring Brood attacks now apply Ensnare to noncombatants, towers, and liftable structures (r. fagguto)
 	- Phalanxes entering siege mode while decolliding with structures now queue a tank mode order instead of self-destructing
@@ -159,6 +162,9 @@ More rebalancings, more new sprites, more bugfixes, and a more useful patch desc
 	- Weapon cooldown now 0.5, from 0.42
 	- Weapon splash radii now 20/30/40, from 30/37/45 (pixels)
 	- Now moves ~15% slower
+- [Zarcavrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/zarcavrokor):
+	- Bones of Reflection now has a short internal cooldown
+	- Now moves 15% slower
 - [Alkajelisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/alkajelisk):
 	- Turn rate now 8, from 12
 - [Zorkiz Shroud](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/zorkiz-shroud):
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index 65679a48..db736629 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ