diff --git a/FuturePlans.md b/FuturePlans.md
index dacbc3770..02993a00c 100644
--- a/FuturePlans.md
+++ b/FuturePlans.md
@@ -3,14 +3,13 @@ after the first release.
 
 * DLC Weapon Set:
   - Itamex Reinforced Hammer (UnSX 5)
-  - Gravity Gun (Ultra Suite)
+  - Puntzer Beta (SWWM Iridium)
   - Puntzer Gamma (Ultra Suite 2)
-  - Skull Launcher (Weirdweapons)
+  - Quadravol (UnSX)
   - Blackfire Igniter (UnSX 5, Ultra Suite 3)
   - Sparkster x3 (UnSX 2)
   - Rail Carbine ("Tesla Beamer" in Ultra Suite 2 & 3)
   - PROWEL & TADEL (Ultra Suite 2 & 3)
-  - Super Happy Fun Ball (SWWM Z)
 * Additional Demolitionist Menu features
   - Stats tab subsections
     - Monster kill tracker
@@ -31,17 +30,20 @@ after the first release.
   - Nutatco™ Chocolate Bar (It's got a savage taste)
   - Hege Cactus (Appears to absorb all water, causing intense thirst)
   - Froggy Chair (A small price to pay)
-  - Raidemin Action Figure (A popular Nukuri superhero)
+  - Raidemin Action Figure (A popular Nukuri superhero, "looks a lot like you")
   - Frispy™ Tasty Corn Snack (Saya's favorite)
   - Hoagie (Can't eat it, but looks delicious)
   - Lithium - Volume One (A work of art, one of the finest graphic novels)
   - [Heretic] Demolitionist Plush ("You're getting famous, Demo-chan")
   - [Heretic] Lord Vilkreath - Fundamentals of Puzzle Design ("The hell is this crap?")
   - [Heretic] Doomguy Action Figure ("Oh, he gets one too?")
+  - [Heretic] Tyketto's Tome of Power ("I think I heard it talk once")
+  - [Heretic] Quartz Flask ("Tastes funny")
   - [Hexen] Toot Froot™ Peach Juice ("The taste reminds me of Kirin")
   - [Hexen] Haunted Saya Bean Plush (Eats your snacks and calls you a horny)
   - [Hexen] Kirin Plushie ("I don't know who made it but I love it")
   - [Hexen] Akkouxhei Milk Bread (Absolutely delicious, in moderation)
+  - [Hexen] Obelisk of the Golden Vale ("I puked out my guts when I touched that fucking thing")
   - ... and more as I come up with them
 * 4komas on the intermission screen
 * Actually make a fancy titlemap
diff --git a/language.version b/language.version
index ba1d5af36..6ce5729b7 100644
--- a/language.version
+++ b/language.version
@@ -1,2 +1,2 @@
 [default]
-SWWM_MODVER="\cxSWWM GZ\c- r333 (Wed 10 Jun 01:00:43 CEST 2020)";
+SWWM_MODVER="\cxSWWM GZ\c- r334 (Wed 10 Jun 20:40:14 CEST 2020)";
diff --git a/zscript/dlc/swwm_dlcammo.zsc b/zscript/dlc/swwm_dlcammo.zsc
index c97b133bb..1e5a2a8eb 100644
--- a/zscript/dlc/swwm_dlcammo.zsc
+++ b/zscript/dlc/swwm_dlcammo.zsc
@@ -1,18 +1,18 @@
 // All DLC weapon ammo pickups
 
-Class GravityCell : Ammo
-{
-}
-
 Class SMW05Ammo : Ammo
 {
 }
 
-Class SkullAmmo : Ammo
+Class SMW05BigAmmo : SMW05Ammo
 {
 }
 
-Class SkullBox : SkullAmmo
+Class QuadravolAmmo : Ammo
+{
+}
+
+Class QuadravolPack : QuadravolAmmo
 {
 }
 
@@ -20,6 +20,10 @@ Class DarkCanister : Ammo
 {
 }
 
+Class LargeDarkCanister : DarkCanister
+{
+}
+
 Class KinylumUnit : Ammo
 {
 }
@@ -35,7 +39,3 @@ Class EMPCore : Ammo
 Class MadCore : Ammo
 {
 }
-
-Class FunBalls : Ammo
-{
-}
diff --git a/zscript/dlc/swwm_grabbity.zsc b/zscript/dlc/swwm_grabbity.zsc
deleted file mode 100644
index 1411c04cd..000000000
--- a/zscript/dlc/swwm_grabbity.zsc
+++ /dev/null
@@ -1,6 +0,0 @@
-// Tach-Engine Technologies Microgravity Manipulator aka "Gravity Gun" (from Zanaveth Ultra Suite)
-// Slot 3, spawns shared with Spreadgun
-
-Class GravityGun : SWWMWeapon
-{
-}
diff --git a/zscript/dlc/swwm_notashotgun.zsc b/zscript/dlc/swwm_notashotgun.zsc
new file mode 100644
index 000000000..a090b129c
--- /dev/null
+++ b/zscript/dlc/swwm_notashotgun.zsc
@@ -0,0 +1,6 @@
+// Kmonn Shuna Quadravol (from UnSX series, not a Quadshot reskin anymore)
+// Slot 5, spawns shared with Eviscerator
+
+Class Quadravol : SWWMWeapon
+{
+}
diff --git a/zscript/dlc/swwm_rebolber.zsc b/zscript/dlc/swwm_rebolber.zsc
new file mode 100644
index 000000000..773bc85d5
--- /dev/null
+++ b/zscript/dlc/swwm_rebolber.zsc
@@ -0,0 +1,6 @@
+// Blackmann Arms "Puntzer Beta" SMW.05 Revolver (planned for unreleased SWWM Iridium)
+// Slot 3, spawns shared with Spreadgun
+
+Class PuntzerBeta : SWWMWeapon
+{
+}
diff --git a/zscript/dlc/swwm_spookyscaryskeletons.zsc b/zscript/dlc/swwm_spookyscaryskeletons.zsc
deleted file mode 100644
index 3c0dfbf1e..000000000
--- a/zscript/dlc/swwm_spookyscaryskeletons.zsc
+++ /dev/null
@@ -1,6 +0,0 @@
-// Dr. Locke's Spooky Scary Skeleton Shooter aka "Skull Launcher" (from unreleased "Weirdweapons" mod)
-// Slot 5, spawns shared with Eviscerator
-
-Class SkullLauncher : SWWMWeapon
-{
-}
diff --git a/zscript/dlc/swwm_superhappyfunball.zsc b/zscript/dlc/swwm_superhappyfunball.zsc
deleted file mode 100644
index 8437506a1..000000000
--- a/zscript/dlc/swwm_superhappyfunball.zsc
+++ /dev/null
@@ -1,6 +0,0 @@
-// Dr. Locke's Super Happy Fun Ball (was meant for SWWM Z)
-// Slot 0, spawns shared with Ynykron Artifact
-
-Class SuperHappyFunBall : SWWMWeapon
-{
-}
diff --git a/zscript/swwm_blazeit.zsc b/zscript/swwm_blazeit.zsc
index 1fbd629b2..d7c599e44 100644
--- a/zscript/swwm_blazeit.zsc
+++ b/zscript/swwm_blazeit.zsc
@@ -106,6 +106,7 @@ Class HellblazerTrail : Actor
 		+NOBLOCKMAP;
 		+DONTSPLASH;
 		+NOTELEPORT;
+		+FORCEXYBILLBOARD;
 	}
 	override void PostBeginPlay()
 	{
@@ -142,6 +143,7 @@ Class HellblazerFlare : Actor
 		+NOBLOCKMAP;
 		+DONTSPLASH;
 		+NOTELEPORT;
+		+FORCEXYBILLBOARD;
 	}
 
 	override void PostBeginPlay()
@@ -899,6 +901,7 @@ Class RavagerPuff : Actor
 		+NOTELEPORT;
 		+ROLLSPRITE;
 		+ROLLCENTER;
+		+FORCEXYBILLBOARD;
 	}
 	override void PostBeginPlay()
 	{
diff --git a/zscript/swwm_shot.zsc b/zscript/swwm_shot.zsc
index f75a182fe..5c97e404b 100644
--- a/zscript/swwm_shot.zsc
+++ b/zscript/swwm_shot.zsc
@@ -322,6 +322,7 @@ Class DragonBreathPuff : Actor
 		+NOTELEPORT;
 		+ROLLSPRITE;
 		+ROLLCENTER;
+		+FORCEXYBILLBOARD;
 	}
 	override void PostBeginPlay()
 	{