diff --git a/src/endWeek/minorInjuryResponse.js b/src/endWeek/minorInjuryResponse.js
index 23072e1dd9549d5103b6b049aca63e313814e04b..dbafcdfced22f4f2eeff0d160e1bf2106570163a 100644
--- a/src/endWeek/minorInjuryResponse.js
+++ b/src/endWeek/minorInjuryResponse.js
@@ -1,6 +1,7 @@
 /* eslint-disable no-undef */
 /* eslint-disable no-unused-vars */
-window.minorInjuryResponse = /** @param {App.Entity.SlaveState} slave */ function minorInjuryResponse(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.minorInjuryResponse = function minorInjuryResponse(slave) {
 	const arcology = State.variables.arcologies[0];
 	const arcologyUpgrade = State.variables.arcologyUpgrade;
 	const pronouns = getPronouns(slave);
diff --git a/src/endWeek/saPorn.js b/src/endWeek/saPorn.js
index fea7013dedb26444c9d3ff878d4761ec26a8e83e..adc7e7ee98372fb4ef903173ca0b5be48ba6d004 100644
--- a/src/endWeek/saPorn.js
+++ b/src/endWeek/saPorn.js
@@ -1,6 +1,7 @@
 /* to later be rolled into saPorn */
 
-window.getHighestPorn = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.getHighestPorn = function(slave) {
 	let max = {value: 0, type: "none"};
 
 	if (slave.porn.fame.general > max.value) {
diff --git a/src/endWeek/saRest.js b/src/endWeek/saRest.js
index 771b3e49ea246d2041612a6ac6823c46d3cb196e..f0511263e92b6c31588bf2a4cc36fbaed2345223 100644
--- a/src/endWeek/saRest.js
+++ b/src/endWeek/saRest.js
@@ -1,4 +1,5 @@
-window.saRest = /** @param {App.Entity.SlaveState} slave */ function saRest(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.saRest = function saRest(slave) {
 	const V = State.variables;
 	const pronouns = getPronouns(slave);
 	const he = pronouns.pronoun;
diff --git a/src/endWeek/saStayConfined.js b/src/endWeek/saStayConfined.js
index 26404bd0f72d461ed0215064b927db8567e7d95e..bce8d7267ab22a54a9f997d2efab2a347ccbf6df 100644
--- a/src/endWeek/saStayConfined.js
+++ b/src/endWeek/saStayConfined.js
@@ -1,4 +1,5 @@
-window.saStayConfined = /** @param {App.Entity.SlaveState} slave */ function saStayConfined(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.saStayConfined = function saStayConfined(slave) {
 	const V = State.variables;
 	const pronouns = getPronouns(slave);
 	const he = pronouns.pronoun;
diff --git a/src/js/slaveGenerationJS.js b/src/js/slaveGenerationJS.js
index f9359ebaf05f3f8120460158166ca28249fe4271..551bc2655a8aa88b4fabc8f262e6139cdce1ef7f 100644
--- a/src/js/slaveGenerationJS.js
+++ b/src/js/slaveGenerationJS.js
@@ -1,8 +1,10 @@
-window.nationalityToRace = /** @param {App.Entity.SlaveState} slave */ function nationalityToRace(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.nationalityToRace = function nationalityToRace(slave) {
 	slave.race = hashChoice(setup.raceSelector[slave.nationality] || setup.raceSelector[""]);
 };
 
-window.raceToNationality = /** @param {App.Entity.SlaveState} slave */ function raceToNationality(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.raceToNationality = function raceToNationality(slave) {
 	/* consider this placeholder until raceNationalities gets fixed up */
 	const V = State.variables;
 	slave.nationality = hashChoice(V.nationalities);
@@ -53,7 +55,8 @@ window.isMaleName = function isMaleName(name, nationality, race) {
 	return names && names.includes(name);
 };
 
-window.nationalityToName = /** @param {App.Entity.SlaveState} slave */ function nationalityToName(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.nationalityToName = function nationalityToName(slave) {
 	const V = State.variables;
 	const male = (slave.genes === "XY");
 
@@ -82,7 +85,8 @@ window.nationalityToName = /** @param {App.Entity.SlaveState} slave */ function
 	}
 };
 
-window.nationalityToAccent = /** @param {App.Entity.SlaveState} slave */ function nationalityToAccent(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.nationalityToAccent = function nationalityToAccent(slave) {
 	const V = State.variables;
 	const naturalAccent = jsEither([0, 1, 1, 2, 2, 2, 3, 3, 3, 3]);
 
@@ -1417,7 +1421,8 @@ window.removeGingering = function removeGingering() {
 	}
 };
 
-window.randomizeAttraction = /** @param {App.Entity.SlaveState} slave*/ function randomizeAttraction(slave) {
+/** @param {App.Entity.SlaveState} slave*/
+window.randomizeAttraction = function randomizeAttraction(slave) {
 	const sexuality = jsRandom(0, 100);
 	let attraction = Math.clamp(slave.energy * 2, 60, 180);
 
@@ -1456,7 +1461,8 @@ window.BaseSlave = function BaseSlave() {
 	return new App.Entity.SlaveState();
 };
 
-window.generatePronouns = /** @param {App.Entity.SlaveState} slave*/ function generatePronouns(slave) {
+/** @param {App.Entity.SlaveState} slave*/
+window.generatePronouns = function generatePronouns(slave) {
 	if (slave.fuckdoll > 0) {
 		slave.pronoun = "it";
 		slave.possessivePronoun = "its";
diff --git a/src/js/slaveStatsChecker.js b/src/js/slaveStatsChecker.js
index 764ddfa58f82e80d3130af4d53f3fbe3b57a00ae..4e42f44e2f5c8328335e85b9dbd4acc5d5fb4b40 100644
--- a/src/js/slaveStatsChecker.js
+++ b/src/js/slaveStatsChecker.js
@@ -137,7 +137,8 @@ window.SlaveStatsChecker = (function() {
 	}
 }());
 
-window.isSlim = /** @param {App.Entity.SlaveState} slave */ function (slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.isSlim = function (slave) {
 	let slim = false;
 	const ArcologyZero = State.variables.arcologies[0];
 
@@ -165,7 +166,8 @@ window.isSlim = /** @param {App.Entity.SlaveState} slave */ function (slave) {
 	return slim;
 };
 
-window.slimPass = /** @param {App.Entity.SlaveState} slave */ function (slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.slimPass = function (slave) {
 	let slimPass = 0;
 	const ArcologyZero = State.variables.arcologies[0];
 
@@ -190,11 +192,13 @@ window.slimPass = /** @param {App.Entity.SlaveState} slave */ function (slave) {
 	return slimPass;
 };
 
-window.isStacked = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.isStacked = function(slave) {
 	return (slave.butt > 4) && (slave.boobs > 800);
 };
 
-window.isModded = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.isModded = function(slave) {
 	const tatScore = SlaveStatsChecker.tatScore(slave);
 	const piercingScore = SlaveStatsChecker.piercingScore(slave);
 	const modScore = piercingScore+tatScore;
@@ -202,35 +206,43 @@ window.isModded = /** @param {App.Entity.SlaveState} slave */ function(slave) {
 	return ((modScore > 15) || (piercingScore > 8 && tatScore > 5));
 };
 
-window.isUnmodded = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.isUnmodded = function(slave) {
 	return (!isModded(slave) && (slave.corsetPiercing === 0) && (SlaveStatsChecker.piercingScore(slave) < 3) && (SlaveStatsChecker.tatScore(slave) < 2));
 };
 
-window.isXY = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.isXY = function(slave) {
 	return (slave.dick > 0);
 };
 
-window.isYoung = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.isYoung = function(slave) {
 	return (slave.visualAge < 30);
 };
 
-window.isPreg = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.isPreg = function(slave) {
 	return ((slave.bellyPreg >= 5000) || (slave.bellyImplant >= 5000));
 };
 
-window.isNotPreg = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.isNotPreg = function(slave) {
 	return (!isPreg(slave) && (slave.belly < 100) && (slave.weight < 30) && !setup.fakeBellies.includes(slave.bellyAccessory));
 };
 
-window.isPure = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.isPure = function(slave) {
 	return ((slave.boobsImplant === 0) && (slave.buttImplant === 0) && (slave.waist >= -95) && (slave.lipsImplant === 0) && (slave.faceImplant < 30) && (slave.bellyImplant === -1) && (Math.abs(slave.shouldersImplant) < 2) && (Math.abs(slave.hipsImplant) < 2));
 };
 
-window.isSurgicallyImproved = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.isSurgicallyImproved = function(slave) {
 	return ((slave.boobsImplant > 0) && (slave.buttImplant > 0) && (slave.waist < -10) && (slave.lipsImplant > 0));
 };
 
-window.isFullyPotent = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.isFullyPotent = function(slave) {
 	if (!slave) {
 		return null;
 	} else if (slave.dick > 0 && slave.balls > 0 && slave.ballType !== "sterile" && slave.hormoneBalance < 100 && slave.drugs !== "hormone blockers") {
@@ -239,7 +251,8 @@ window.isFullyPotent = /** @param {App.Entity.SlaveState} slave */ function(slav
 	return false;
 };
 
-window.canGetPregnant = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.canGetPregnant = function(slave) {
 	if (!slave) {
 		return null;
 	} else if (slave.preg === -1) { /* contraceptives check */
@@ -295,7 +308,8 @@ window.isFertile = function(slave) {
 	return false;
 };
 
-window.canAchieveErection = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.canAchieveErection = function(slave) {
 	if (!slave) {
 		return null;
 	} else if (slave.dick < 7 && slave.dick > 0 && slave.drugs !== "hormone blockers" && (slave.balls > 0 ? slave.hormoneBalance < 100 : slave.hormoneBalance <= -100) && slave.ballType !== "sterile") {
@@ -304,7 +318,8 @@ window.canAchieveErection = /** @param {App.Entity.SlaveState} slave */ function
 	return false;
 };
 
-window.canPenetrate = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.canPenetrate = function(slave) {
 	if (!slave) {
 		return null;
 	} else if (!canAchieveErection(slave)) {
@@ -317,35 +332,40 @@ window.canPenetrate = /** @param {App.Entity.SlaveState} slave */ function(slave
 	return true;
 };
 
-window.canSee = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.canSee = function(slave) {
 	if (!slave) {
 		return null;
 	}
 	return (slave.eyes > -2);
 };
 
-window.canHear = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.canHear = function(slave) {
 	if (!slave) {
 		return null;
 	}
 	return ((slave.hears > -2) && (slave.earwear !== "deafening ear plugs"));
 };
 
-window.canSmell = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.canSmell = function(slave) {
 	if (!slave) {
 		return null;
 	}
 	return (slave.smells > -1);
 };
 
-window.canTaste = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.canTaste = function(slave) {
 	if (!slave) {
 		return null;
 	}
 	return (slave.tastes > -1);
 };
 
-window.canWalk = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.canWalk = function(slave) {
 	if (!slave) {
 		return null;
 	} else if (slave.amp === 1) {
@@ -374,7 +394,8 @@ window.canWalk = /** @param {App.Entity.SlaveState} slave */ function(slave) {
 	return false;
 };
 
-window.canTalk = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.canTalk = function(slave) {
 	if (!slave) {
 		return null;
 	} else if (slave.accent > 2) {
@@ -395,7 +416,8 @@ window.canTalk = /** @param {App.Entity.SlaveState} slave */ function(slave) {
 	return true;
 };
 
-window.canDoAnal = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.canDoAnal = function(slave) {
 	if (!slave) {
 		return null;
 	} else if (slave.chastityAnus === 1) {
@@ -404,7 +426,8 @@ window.canDoAnal = /** @param {App.Entity.SlaveState} slave */ function(slave) {
 	return true;
 };
 
-window.canDoVaginal = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.canDoVaginal = function(slave) {
 	if (!slave) {
 		return null;
 	} else if (slave.vagina < 0) {
@@ -415,7 +438,8 @@ window.canDoVaginal = /** @param {App.Entity.SlaveState} slave */ function(slave
 	return true;
 };
 
-window.tooFatSlave = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.tooFatSlave = function(slave) {
 	if (!slave) {
 		return null;
 	} else if (slave.weight > 190+(slave.muscles/5) && slave.physicalAge >= 18) {
@@ -430,7 +454,8 @@ window.tooFatSlave = /** @param {App.Entity.SlaveState} slave */ function(slave)
 	return false;
 };
 
-window.tooBigBreasts = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.tooBigBreasts = function(slave) {
 	if (!slave) {
 		return null;
 	} else if (slave.boobs > 30000+(slave.muscles*100) && slave.physicalAge >= 18) {
@@ -445,7 +470,8 @@ window.tooBigBreasts = /** @param {App.Entity.SlaveState} slave */ function(slav
 	return false;
 };
 
-window.tooBigBelly = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.tooBigBelly = function(slave) {
 	if (!slave) {
 		return null;
 	} else if (slave.belly >= 450000+(slave.muscles*2000) && slave.physicalAge >= 18) {
@@ -460,7 +486,8 @@ window.tooBigBelly = /** @param {App.Entity.SlaveState} slave */ function(slave)
 	return false;
 };
 
-window.tooBigBalls = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.tooBigBalls = function(slave) {
 	if (!slave) {
 		return null;
 	} else if (slave.balls >= 30+(slave.muscles*.3) && slave.physicalAge <= 3) {
@@ -473,7 +500,8 @@ window.tooBigBalls = /** @param {App.Entity.SlaveState} slave */ function(slave)
 	return false;
 };
 
-window.tooBigDick = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.tooBigDick = function(slave) {
 	if (!slave) {
 		return null;
 	} else if (slave.dick >= 20+(slave.muscles*.1) && slave.physicalAge <= 3 && slave.dick !== 0) {
@@ -486,7 +514,8 @@ window.tooBigDick = /** @param {App.Entity.SlaveState} slave */ function(slave)
 	return false;
 };
 
-window.tooBigButt = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.tooBigButt = function(slave) {
 	if (!slave) {
 		return null;
 	} else if (slave.butt > 10 && slave.physicalAge <= 3) {
@@ -497,7 +526,8 @@ window.tooBigButt = /** @param {App.Entity.SlaveState} slave */ function(slave)
 	return false;
 };
 
-window.isVegetable = /** @param {App.Entity.SlaveState} slave */ function(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.isVegetable = function(slave) {
 	slave = slave || State.variables.activeSlave;
 	if (!slave) { return false; }
 	return (slave.fetish === "mindbroken");
diff --git a/src/js/vignettes.js b/src/js/vignettes.js
index cbf39bd201f03d836ac41edda40c5f2943c7a213..9fc817d3860ee2bc3f065b5070da27013b25df27 100644
--- a/src/js/vignettes.js
+++ b/src/js/vignettes.js
@@ -1,5 +1,6 @@
 /* eslint-disable no-undef */
-window.GetVignette = /** @param {App.Entity.SlaveState} slave */ function GetVignette(slave) {
+/** @param {App.Entity.SlaveState} slave */
+window.GetVignette = function GetVignette(slave) {
 	const V = State.variables;
 	let vignettes = [];