diff --git a/FuturePlans.md b/FuturePlans.md
index d86bee143..9310ed85a 100644
--- a/FuturePlans.md
+++ b/FuturePlans.md
@@ -34,6 +34,7 @@ after the first release.
   - 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)
+  - PISS Whiskey ("Is it actually piss or is that just the brand name? Either way, I don't want to know what's inside")
   - [Heretic] Demolitionist Plush ("You're getting famous, Demo-chan")
   - [Heretic] Firemace ("What kind of ridiculous weapon is this?")
   - [Heretic] Doomguy Action Figure ("Oh, he gets one too?")
diff --git a/TODO.md b/TODO.md
index f0bb29a19..f7287b349 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,27 +1,37 @@
-Fundamental things:
- - Ynykron Artifact
+Fundamental things before beta:
+ - Ynykron Artifact altfire
 
-Not so fundamental things:
+Not so fundamental things during beta:
  - Extra Demolitionist animations (swimming, additional gestures)
+ - Item detection button (highlights nearby, visible items)
+ - Dual wielding Explodium Gun
+ - Quick grenade function (Explodium Mag)
+ - Mag refilling system (no more wasted ammo)
+ - Randomized vanilla monster retagging with multiple options
+ - Fun options
+   - Omnibusting (all weapons can bust walls)
+   - Infinite fuel
+   - Confetti gibs
+ - Keen replacement (need ideas)
+ - Achievements
+ - Collectables
 
-Extra things:
- - Art for custom intermission
+Extra things for later:
+ - More art for custom intermission
    - Commission fanart or something idk
    - Draw some 4Komas myself
  - Titlemap stuff
    - A background with a bit more flair than just the fuzz shader.
    - Some sort of flyby featuring the Demolitionist booting up, closeups of
      weapons/items etc.
- - Dual wielding Explodium Gun
- - Quick grenade function (Explodium Mag)
- - Mag refilling system (no more wasted ammo)
- - Randomized vanilla monster retagging with multiple options
  - Japanese localization
- - Keen replacement (need ideas)
+ - Extra Demolitionist Menu tabs
  - Mod trailer video
 
-Very extra things:
+Very extra things for the future:
+ - DLC
  - Strife support
    - Rewrite all the game's dialogue
    - Rewrite all the shop systems and other things
    - Rewrite the cutscenes
+ - Saya and Ibuki companion add-ons
diff --git a/language.version b/language.version
index 7504cab37..dd8d6b161 100644
--- a/language.version
+++ b/language.version
@@ -1,2 +1,2 @@
 [default]
-SWWM_MODVER="\chSWWM \cwGZ\c- r415 (Tue 30 Jun 19:31:15 CEST 2020)";
+SWWM_MODVER="\chSWWM \cwGZ\c- r416 (Sat 11 Jul 20:12:53 CEST 2020)";
diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc
index da5b0bd48..27940f8a1 100644
--- a/zscript/swwm_player.zsc
+++ b/zscript/swwm_player.zsc
@@ -479,6 +479,7 @@ Class Demolitionist : PlayerPawn
 			selflight.target = self;
 			selflight.Tick();
 		}
+		if ( player.mo != self ) return;	// no voodoo dolls past this point
 		oldlagvel = lagvel;
 		oldlagready = lagready;
 		if ( player.weaponstate&WF_WEAPONBOBBING ) lagready = lagready*.9+.1;