diff --git a/game/04-Variables/variables-versionUpdate.twee b/game/04-Variables/variables-versionUpdate.twee
index ff6d6a82d6beb8b359a9ec7c9ffd38b9b8c6edb3..cda9087873a45b58a5f57d361b692e7a8ca09a3f 100644
--- a/game/04-Variables/variables-versionUpdate.twee
+++ b/game/04-Variables/variables-versionUpdate.twee
@@ -3593,9 +3593,9 @@
 		<<set $objectVersion.specialClothes to 14>>
 	<</if>>
 
-	<<if $objectVersion.wardrobes lt 6 or $objectVersion.wardrobes is undefined>>
+	<<if $objectVersion.wardrobes lt 7 or $objectVersion.wardrobes is undefined>>
 		<<wardrobesUpdate>>
-		<<set $objectVersion.wardrobes to 6>>
+		<<set $objectVersion.wardrobes to 7>>
 	<</if>>
 
 	<<if $objectVersion.museumAntiques lte 14 and $museumAntiques.antiques.antiquewhitescrystal isnot undefined>>
@@ -4796,4 +4796,12 @@
 			moneyModifier: 0
 		}>>
 	<</if>>
+	<<if $outfit_update is undefined or $outfit_update lt 4>>
+		<<set $outfit_update to 4>>
+		<<for $_i to 0; $_i lt $outfit.length; $_i++>>
+			<<if $outfit[$_i].handheld is undefined>>
+				<<set $outfit[$_i].handheld to "naked">>
+			<</if>>
+		<</for>>
+	<</if>>
 <</widget>>
diff --git a/game/base-clothing/updateClothes.js b/game/base-clothing/updateClothes.js
index c8a4d8f0fa4590946f404cf141cefa0590da0ae1..156961df00fcc71d155e011ca7e28b7f038cc88d 100644
--- a/game/base-clothing/updateClothes.js
+++ b/game/base-clothing/updateClothes.js
@@ -325,5 +325,10 @@ function wardrobesUpdate() {
 		V.wardrobes.pirate.unlocked = V.pirate_rank >= 0;
 		V.wardrobes.pirate.space = 5;
 	}
+	if (V.objectVersion.wardrobes < 7) {
+		Object.values(V.wardrobes).forEach(wardrobe => {
+			if (wardrobe && Array.isArray(wardrobe.upper) && !wardrobe.handheld) wardrobe.handheld = [];
+		});
+	}
 }
 DefineMacro("wardrobesUpdate", wardrobesUpdate);
diff --git a/game/base-system/overlays/featsUI.twee b/game/base-system/overlays/featsUI.twee
index 70e0fc23148bed35c9c23281fa9453456dc9fcb2..cc2cccb09bba508b3310c2e06a3f10a7e8af8394 100644
--- a/game/base-system/overlays/featsUI.twee
+++ b/game/base-system/overlays/featsUI.twee
@@ -48,7 +48,7 @@
 	<<set _filter to "All">>
 	<<set _keys to Object.keys(setup.feats)>>
 	<<for _i to 0; _i lt _keys.length; _i++>>
-		<<if _skip.includes(setup.feats[_keys[_i]].series) or !setup.feats[_keys[_i]].filter.includes($feats.filter)>>
+		<<if !setup.feats[_keys[_i]].filter.includes($feats.filter)>>
 			<<continue>>
 		<</if>>
 		<<if Object.keys($feats.currentSave).includes(_keys[_i])>>
@@ -57,7 +57,7 @@
 			<<set _owned to 1>>
 		<<else>>
 			<<set _owned to 0>>
-			<<if setup.feats[_keys[_i]].hidden>>
+			<<if setup.feats[_keys[_i]].hidden or _skip.includes(setup.feats[_keys[_i]].series)>>
 				<<continue>>
 			<</if>>
 			<<if setup.feats[_keys[_i]].series isnot "">>
diff --git a/game/base-system/time/time.js b/game/base-system/time/time.js
index 63a5f5293df2d10506043afb4533f1c2080860f0..62292fcfd3dfe88e7a01a62ecaeb26a387b06dbf 100644
--- a/game/base-system/time/time.js
+++ b/game/base-system/time/time.js
@@ -346,7 +346,7 @@ function weekPassed() {
 		fragment.append(wikifier("robinPunishment", "docks"));
 		V.robineventnote = 1;
 	}
-    V.robinmoney += (300 + V.robin.moneyModifier);
+	V.robinmoney += 300 + V.robin.moneyModifier;
 	V.compoundcentre = 0;
 	if (V.edenfreedom >= 1 && V.edenshopping === 2) V.edenshopping = 0;
 	if (V.loft_kylar) V.loft_spray = 0;
@@ -1872,12 +1872,13 @@ function earSlimeDaily(passageEffects = false) {
 				V.worn.genitals.integrity = clothingData("genitals", V.worn.genitals, "integrity_max");
 			}
 		}
-		if (V.earSlime.forcedCommando && V.earSlime.forcedCommando > 0) {
-			V.earSlime.forcedCommando--;
-		}
 		if (V.earSlime.forcedDressing && V.earSlime.forcedDressing.days > 0) {
 			V.earSlime.forcedDressing.days--;
 		}
 	}
+
+	if (V.earSlime.forcedCommando && V.earSlime.forcedCommando > 0) {
+		V.earSlime.forcedCommando--;
+	}
 }
 DefineMacro("earSlimeDaily", earSlimeDaily);
diff --git a/game/overworld-plains/loc-farm/cottage.twee b/game/overworld-plains/loc-farm/cottage.twee
index 76c639b42d2781fb27e2e02c1920df6193c34c58..492b9cfa1600b101cf3cb758405e3b5a726d49f1 100644
--- a/game/overworld-plains/loc-farm/cottage.twee
+++ b/game/overworld-plains/loc-farm/cottage.twee
@@ -729,6 +729,8 @@ You shove Alex away, harder this time. <<He>> falls from the bed. "Suit yourself
 
 		<<tearful>> you roll over.
 		<br><br>
+		<<clotheson>>
+		<<endcombat>>
 
 		<<link [[Next|Farm Bed]]>><</link>>
 	<</if>>
diff --git a/game/overworld-town/loc-sea/main.twee b/game/overworld-town/loc-sea/main.twee
index 1feeb17ffdb643d90539bd5d19ca58d6a3cca116..311ca9b80b0c25e1006a167791d8fc83dbb0a954 100644
--- a/game/overworld-town/loc-sea/main.twee
+++ b/game/overworld-town/loc-sea/main.twee
@@ -144,7 +144,6 @@ You are on the rocks to the west of the beach. Most of them become covered by wa
 <br><br>
 There's a sheltered space atop one of the rocks, above a deep pool.
 <br>
-<<storeactions "beachrocks">>
 <<if $smuggler_location is "beach" and $smuggler_timer is 0 and Time.dayState is "night" and Time.hour gte 18>>
 	<<smugglerdifficultytext>>
 <</if>>
@@ -179,6 +178,7 @@ There's a sheltered space atop one of the rocks, above a deep pool.
 <<if $stress gte $stressmax>>
 	<<passoutbeach>>
 <<else>>
+	<<storeactions "beachrocks">>
 	<<if $smuggler_location is "beach" and $smuggler_timer is 0 and Time.dayState is "night" and Time.hour gte 18>>
 		<<smugglerdifficultyactions>>
 		<br>
diff --git a/game/special-masturbation/actions.js b/game/special-masturbation/actions.js
index 5569ec1955d79e4b9f3026bf43dc59a8e86cd8de..9ed187837ce45cb7f756707b26d1cf165c2a9624 100644
--- a/game/special-masturbation/actions.js
+++ b/game/special-masturbation/actions.js
@@ -110,7 +110,7 @@ function masturbationActions() {
 		fragment.append(wikifier("promiscuity1"));
 		V.masturbationorgasmstat++;
 		V.masturbationorgasm++;
-		if (V.femaleclimax !== 1 && V.mouth !== "mpenis") {
+		if (V.femaleclimax !== 1 && !T.deniedOrgasm && V.worn.genitals.name !== "chastity parasite" && V.mouth !== "mpenis") {
 			V.masturbationorgasmsemen++;
 		}
 		fragment.append(wikifier("purity", -1));