diff --git a/src/endWeek/saChoosesOwnClothes.js b/src/endWeek/saChoosesOwnClothes.js
index 41d9cc0d7bcd9d14e41bb9f1f118cc640d293e84..7ba75136b79cfb66c747eacb117a5847360f811a 100644
--- a/src/endWeek/saChoosesOwnClothes.js
+++ b/src/endWeek/saChoosesOwnClothes.js
@@ -1,6 +1,3 @@
-/* eslint-disable no-empty */
-/* eslint-disable no-undef */
-/* eslint-disable no-unused-vars */
 window.saChoosesOwnClothes = (function() {
 	"use strict";
 	let V;
@@ -103,96 +100,96 @@ window.saChoosesOwnClothes = (function() {
 		const wardrobeTastes = [];
 		let selection;
 
-		if (slave.fetish === 'mindbroken') {
+		if (slave.fetish === "mindbroken") {
 			if (V.arcologies[0].FSChattelReligionist > 0) {
 				selection = {text: `${he} commonly sees others wearing chattel habits and is drawn to doing so ${himself}.`, clothes: "a chattel habit"};
 			} else {
-				clothing.push('panties');
+				clothing.push("panties");
 				if (V.arcologies[0].FSEgyptianRevivalist > 0) {
-					clothing.push('egyptian');
+					clothing.push("egyptian");
 				} else if (V.arcologies[0].FSRomanRevivalist > 0) {
-					clothing.push('roman');
+					clothing.push("roman");
 				} else if (V.arcologies[0].FSAztecRevivalist > 0) {
-					clothing.push('aztec');
+					clothing.push("aztec");
 				} else if (V.arcologies[0].FSEdoRevivalist > 0) {
-					clothing.push('edo');
+					clothing.push("edo");
 				} else if (V.arcologies[0].FSArabianRevivalist > 0) {
-					clothing.push('arabic');
+					clothing.push("arabic");
 				} else if (V.arcologies[0].FSChineseRevivalist > 0) {
-					clothing.push('chinese');
+					clothing.push("chinese");
 				}
 				if (V.arcologies[0].FSGenderFundamentalist > 0) {
-					clothing.push('genderFund');
+					clothing.push("genderFund");
 				}
 				if (V.arcologies[0].FSPaternalist > 0) {
-					clothing.push('paternalist');
+					clothing.push("paternalist");
 				} else if (V.arcologies[0].FSDegradationist > 0) {
-					clothing.push('degradationist');
+					clothing.push("degradationist");
 				}
 				if (V.arcologies[0].FSMaturityPreferentialist > 0) {
-					clothing.push('mature');
+					clothing.push("mature");
 				} else if (V.arcologies[0].FSYouthPreferentialist > 0) {
-					clothing.push('youth');
+					clothing.push("youth");
 				}
 				if (V.arcologies[0].FSPhysicalIdealist > 0) {
-					clothing.push('physicalIdealist');
+					clothing.push("physicalIdealist");
 				}
 				if (V.arcologies[0].FSPastoralist > 0) {
-					clothing.push('pastoralist');
+					clothing.push("pastoralist");
 				}
 				if (V.arcologies[0].FSBodyPurist > 0) {
-					clothing.push('bodyPurist');
+					clothing.push("bodyPurist");
 				}
 				chosenClothing = jsEither(clothing);
 				switch (chosenClothing) {
-					case 'egyptian':
+					case "egyptian":
 						selection = {text: `${he} commonly sees others wearing nothing but jewelry and is drawn to doing so ${himself}.`, clothes: "slutty jewelry"};
 						break;
-					case 'roman':
+					case "roman":
 						selection = {text: `${he} commonly sees others wearing togas and is drawn to doing so ${himself}.`, clothes: "a toga"};
 						break;
-					case 'aztec':
+					case "aztec":
 						selection = {text: `${he} commonly sees others wearing huipils and is drawn to doing so ${himself}.`, clothes: "a huipil"};
 						break;
-					case 'edo':
+					case "edo":
 						selection = {text: `${he} commonly sees others wearing kimonos and is drawn to doing so ${himself}.`, clothes: "a kimono"};
 						break;
-					case 'arabic':
+					case "arabic":
 						selection = {text: `${he} commonly sees others wearing silk and is drawn to doing so ${himself}.`, clothes: "harem gauze"};
 						break;
-					case 'chinese':
+					case "chinese":
 						selection = {text: `${he} commonly sees others wearing qipaos and is drawn to doing so ${himself}.`, clothes: "a slutty qipao"};
 						break;
-					case 'genderFund':
+					case "genderFund":
 						if (jsRandom(1, 2) === 1) {
-							selection = {text: `${he} commonly sees cheerleaders around and instinctually follows along.`, clothes: jsEither(['a cheerleader outfit', 'a schoolgirl outfit'])};
+							selection = {text: `${he} commonly sees cheerleaders around and instinctually follows along.`, clothes: jsEither(["a cheerleader outfit", "a schoolgirl outfit"])};
 						} else {
 							selection = {text: `${he} commonly sees bunnies around and instinctually follows along.`, clothes: "a bunny outfit"};
 						}
 						break;
-					case 'paternalist':
+					case "paternalist":
 						selection = {text: `${he} commonly sees others wearing normal clothing and is drawn to doing so ${himself}.`, clothes: "conservative clothing"};
 						break;
-					case 'degradationist':
-						selection = {text: `${he} commonly sees others wearing chains and is drawn to doing so ${himself}.`, clothes: jsEither(['chains', 'shibari ropes', 'uncomfortable straps'])};
+					case "degradationist":
+						selection = {text: `${he} commonly sees others wearing chains and is drawn to doing so ${himself}.`, clothes: jsEither(["chains", "shibari ropes", "uncomfortable straps"])};
 						break;
-					case 'mature':
-						selection = {text: `${he} commonly sees others wearing suits and is drawn to doing so ${himself}.`, clothes: jsEither(['a nice maid outfit', 'nice business attire', 'slutty business attire'])};
+					case "mature":
+						selection = {text: `${he} commonly sees others wearing suits and is drawn to doing so ${himself}.`, clothes: jsEither(["a nice maid outfit", "nice business attire", "slutty business attire"])};
 						break;
-					case 'youth':
-						selection = {text: `${he} commonly sees schoolgirls around and instinctually follows along.`, clothes: jsEither(['a cheerleader outfit', 'a schoolgirl outfit'])};
+					case "youth":
+						selection = {text: `${he} commonly sees schoolgirls around and instinctually follows along.`, clothes: jsEither(["a cheerleader outfit", "a schoolgirl outfit"])};
 						break;
-					case 'physicalIdealist':
-						selection = {text: `${he} commonly sees naked girls around and seldom realizes they are coated in oil.`, clothes: jsEither(['body oil', 'no clothing', 'no clothing'])};
+					case "physicalIdealist":
+						selection = {text: `${he} commonly sees naked girls around and seldom realizes they are coated in oil.`, clothes: jsEither(["body oil", "no clothing", "no clothing"])};
 						break;
-					case 'pastoralist':
+					case "pastoralist":
 						selection = {text: `${he} commonly sees cowgirls around and instinctually follows along.`, clothes: "Western clothing"};
 						break;
-					case 'bodyPurist':
-						selection = {text: `${he} commonly sees others wearing tight, form-fitting clothes and is drawn to doing so ${himself}.`, clothes: jsEither(['a comfortable bodysuit', 'a halter top dress', 'a leotard', 'a leotard', 'a slave gown', 'a string bikini', 'clubslut netting', 'restrictive latex'])};
+					case "bodyPurist":
+						selection = {text: `${he} commonly sees others wearing tight, form-fitting clothes and is drawn to doing so ${himself}.`, clothes: jsEither(["a comfortable bodysuit", "a halter top dress", "a leotard", "a leotard", "a slave gown", "a string bikini", "clubslut netting", "restrictive latex"])};
 						break;
 					default:
-						selection = {text: `${he} chooses to put on underwear, the reasons lost to ${him}, and moves on.`, clothes: jsEither(['attractive lingerie', 'panties'])};
+						selection = {text: `${he} chooses to put on underwear, the reasons lost to ${him}, and moves on.`, clothes: jsEither(["attractive lingerie", "panties"])};
 						break;
 				}
 			}
@@ -953,7 +950,7 @@ window.saChoosesOwnClothes = (function() {
 	function todaysShoes(slave) {
 		const shoes = [];
 
-		if (slave.fetish === 'mindbroken') {
+		if (slave.fetish === "mindbroken") {
 			if (slave.amp !== 1 && slave.heels === 1) {
 				shoes.push({text: `${He} finds ${he} can inexplicably walk if ${he} wears heels; a daily lesson for ${him}, as ${he} forgets shortly after leaving.`, shoes: jsEither(["boots", "extreme heels", "heels", "pumps"])});
 			}
@@ -996,7 +993,7 @@ window.saChoosesOwnClothes = (function() {
 	function todaysCollar(slave) {
 		const neck = [];
 
-		if (slave.fetish === 'mindbroken') {
+		if (slave.fetish === "mindbroken") {
 		} else if (slave.devotion <= 20) {
 		} else {
 			if (V.arcologies[0].FSEgyptianRevivalist > 0) {
@@ -1024,7 +1021,7 @@ window.saChoosesOwnClothes = (function() {
 		const belly = [];
 		const empathyBellies = ["a small empathy belly", "a medium empathy belly", "a large empathy belly", "a huge empathy belly"];
 
-		if (slave.fetish === 'mindbroken') {
+		if (slave.fetish === "mindbroken") {
 			if (V.arcologies[0].FSRepopulationFocus > 0 && slave.belly < 1500) {
 				if (slave.weight > 130) {
 					belly.push({text: `${He} notices the fake bellies; since every girl ${he} has ever met has a rounded middle, it's only natural ${he} is compelled to wear one. ${He} struggles to fit it around ${his} huge gut, only stopping when another slave takes it away from ${him} so ${he} moves on and stops blocking the wardrobe with ${his} fat ass.`, bellyAccessory: "none"});
diff --git a/src/endWeek/saRest.js b/src/endWeek/saRest.js
index 87ebcf033c35d8cda751f3c90d094ac289e22572..cd32de24646df7155de4da6c5142851baa9732ea 100644
--- a/src/endWeek/saRest.js
+++ b/src/endWeek/saRest.js
@@ -1,13 +1,16 @@
-/* eslint-disable no-undef */
-/* eslint-disable no-unused-vars */
 window.saRest = /** @param {App.Entity.SlaveState} slave */ function saRest(slave) {
+	const V = State.variables;
+	const pronouns = getPronouns(slave);
+	const he = pronouns.pronoun;
+	const him = pronouns.object;
+	const his = pronouns.possessive;
+	const hers = pronouns.possessivePronoun;
+	const himself = pronouns.objectReflexive;
+	const boy = pronouns.noun;
+	const He = capFirstChar(he);
+	const His = capFirstChar(his);
 
-	var pronouns = getPronouns(slave);
-	var he = pronouns.pronoun, him = pronouns.object, his = pronouns.possessive, hers = pronouns.possessivePronoun, himself = pronouns.objectReflexive, boy = pronouns.noun;
-	var He = capFirstChar(he), His = capFirstChar(his);
-	var V = State.variables;
-
-	var t = ` takes the week off.`;
+	let t = " takes the week off.";
 
 	if (slave.fuckdoll > 0) {
 		t += ` ${He} has nothing to do but `;
@@ -54,7 +57,7 @@ window.saRest = /** @param {App.Entity.SlaveState} slave */ function saRest(slav
 	}
 
 	if (V.showVignettes === 1 && slave.assignment === Job.REST) {
-		var _vignette = GetVignette(slave);
+		const _vignette = GetVignette(slave);
 		t += ` __This week__ ${_vignette.text} `;
 		if (_vignette.type === "cash") {
 			if (_vignette.effect > 0) {
diff --git a/src/endWeek/saServant.js b/src/endWeek/saServant.js
index e58b06959ed64569e1f8c67e1142404148e72c71..74fb208236a74ad06557123e7b6f06256b3d86de 100644
--- a/src/endWeek/saServant.js
+++ b/src/endWeek/saServant.js
@@ -1,13 +1,16 @@
-/* eslint-disable no-unused-vars */
-/* eslint-disable no-undef */
 window.saServant = /** @param {App.Entity.SlaveState} slave */ function saServant(slave) {
+	const V = State.variables;
+	const pronouns = getPronouns(slave);
+	const he = pronouns.pronoun;
+	const him = pronouns.object;
+	const his = pronouns.possessive;
+	const hers = pronouns.possessivePronoun;
+	const himself = pronouns.objectReflexive;
+	const boy = pronouns.noun;
+	const He = capFirstChar(he);
+	const His = capFirstChar(his);
 
-	var pronouns = getPronouns(slave);
-	var he = pronouns.pronoun, him = pronouns.object, his = pronouns.possessive, hers = pronouns.possessivePronoun, himself = pronouns.objectReflexive, boy = pronouns.noun;
-	var He = capFirstChar(he), His = capFirstChar(his);
-	var V = State.variables;
-
-	var t = `works as a servant. ${He} performs the lowest jobs in your penthouse, cleaning up after your other slaves, bathing them, helping them dress, and giving them sexual relief.`;
+	let t = `works as a servant. ${He} performs the lowest jobs in your penthouse, cleaning up after your other slaves, bathing them, helping them dress, and giving them sexual relief.`;
 
 	if (V.servantsQuarters > 0) {
 		if ((V.universalRulesFacilityWork === 1 && slave.assignment === "be a servant" && V.servantsQuartersSpots > 0) || (slave.assignment === "work as a servant")) {
@@ -61,7 +64,7 @@ window.saServant = /** @param {App.Entity.SlaveState} slave */ function saServan
 	}
 
 	if (slave.releaseRules !== "chastity") {
-		let _oral = jsRandom(5,10);
+		const _oral = jsRandom(5, 10);
 		slave.oralCount += _oral;
 		V.oralTotal += _oral;
 	}
@@ -77,7 +80,7 @@ window.saServant = /** @param {App.Entity.SlaveState} slave */ function saServan
 	} else if (slave.skillS >= V.masteredXP) {
 		t += ` ${He} has experience with house keeping from working for you, making ${him} more effective.`;
 	} else {
-		slave.skillS += jsRandom(1,Math.ceil((slave.intelligence+slave.intelligenceImplant)/15) + 8);
+		slave.skillS += jsRandom(1, Math.ceil((slave.intelligence+slave.intelligenceImplant)/15) + 8);
 	}
 
 	if (slave.fetishStrength > 60) {
@@ -114,7 +117,7 @@ window.saServant = /** @param {App.Entity.SlaveState} slave */ function saServan
 	}
 
 	if (V.showVignettes === 1 && (slave.assignment === Job.SERVANT || slave.assignment === Job.SERVER)) {
-		var _vignette = GetVignette(slave);
+		const _vignette = GetVignette(slave);
 		t += ` __This week__ ${_vignette.text} `;
 		if (_vignette.type === "cash") {
 			if (_vignette.effect > 0) {
diff --git a/src/endWeek/saStayConfined.js b/src/endWeek/saStayConfined.js
index a2b6fbb528e52f464f56ad3e537322be7cae3b9c..26404bd0f72d461ed0215064b927db8567e7d95e 100644
--- a/src/endWeek/saStayConfined.js
+++ b/src/endWeek/saStayConfined.js
@@ -1,13 +1,16 @@
-/* eslint-disable no-undef */
-/* eslint-disable no-unused-vars */
 window.saStayConfined = /** @param {App.Entity.SlaveState} slave */ function saStayConfined(slave) {
+	const V = State.variables;
+	const pronouns = getPronouns(slave);
+	const he = pronouns.pronoun;
+	const him = pronouns.object;
+	const his = pronouns.possessive;
+	const hers = pronouns.possessivePronoun;
+	const himself = pronouns.objectReflexive;
+	const boy = pronouns.noun;
+	const He = capFirstChar(he);
+	const His = capFirstChar(his);
 
-	var pronouns = getPronouns(slave);
-	var he = pronouns.pronoun, him = pronouns.object, his = pronouns.possessive, hers = pronouns.possessivePronoun, himself = pronouns.objectReflexive, boy = pronouns.noun;
-	var He = capFirstChar(he), His = capFirstChar(his);
-	var V = State.variables;
-
-	var t = "";
+	let t = "";
 
 	if (slave.fetish !== "mindbroken") {
 		if (slave.devotion < -50) {
diff --git a/src/js/SetBellySize.js b/src/js/SetBellySize.js
index 963e39484853c09f46297a41a58772c36f1af06c..657bd987bd790568386715dd8e0b09ab6cc8e16e 100644
--- a/src/js/SetBellySize.js
+++ b/src/js/SetBellySize.js
@@ -1,23 +1,23 @@
-/* eslint-disable no-undef */
 /** @param {App.Entity.SlaveState} slave */
 window.SetBellySize = function SetBellySize(slave) {
-
 	let _implantSize;
 	WombNormalizePreg(slave); /* now with support for legacy code that advances pregnancy by setting .preg++ */
 
-	if (slave.bellyImplant > 0)
+	if (slave.bellyImplant > 0) {
 		_implantSize = slave.bellyImplant;
-	else
+	} else {
 		_implantSize = 0;
+	}
 
-	if (slave.inflation === 3)
+	if (slave.inflation === 3) {
 		slave.bellyFluid = 10000;
-	else if (slave.inflation === 2)
+	} else if (slave.inflation === 2) {
 		slave.bellyFluid = 5000;
-	else if (slave.inflation === 1)
+	} else if (slave.inflation === 1) {
 		slave.bellyFluid = 2000;
-	else
+	} else {
 		slave.bellyFluid = 0;
+	}
 
 	slave.belly = slave.bellyPreg+slave.bellyFluid+_implantSize;
 };
diff --git a/src/js/removeActiveSlave.js b/src/js/removeActiveSlave.js
index 4b20f23fe4568dadc53f1965ab9df19c448f2366..dc63e0ae2747168cae69d31c9ac4cdc077e21df8 100644
--- a/src/js/removeActiveSlave.js
+++ b/src/js/removeActiveSlave.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
 window.removeActiveSlave = function removeActiveSlave() {
 	"use strict";
 	const V = State.variables;
@@ -215,7 +214,7 @@ window.removeActiveSlave = function removeActiveSlave() {
 			if (!keep) { /* avoid going through this loop if possible */
 				keep = V.slaves.some(slave => {
 					/* have we impregnated a slave that is not ourselves? */
-					return (slave.ID !== AS_ID && isImpregnatedBy(slave, V.activeSlave))
+					return (slave.ID !== AS_ID && isImpregnatedBy(slave, V.activeSlave));
 				});
 			}
 			if (!keep) {
@@ -227,9 +226,9 @@ window.removeActiveSlave = function removeActiveSlave() {
 				slaveName: V.activeSlave.slaveName,
 				slaveSurname: V.activeSlave.slaveSurname,
 				fullName: SlaveFullName(V.activeSlave),
-				dick : V.activeSlave.dick,
-				vagina : V.activeSlave.vagina,
-				ID : V.missingParentID
+				dick: V.activeSlave.dick,
+				vagina: V.activeSlave.vagina,
+				ID: V.missingParentID
 			};
 			if (V.traitor.ID === V.activeSlave.ID) { /* To link developing fetuses to their parent */
 				V.traitor.missingParentTag = V.missingParentID;
@@ -337,7 +336,7 @@ window.removeNonNGPSlave = function removeNonNGPSlave(removedSlave) {
 			if (!keep) { /* avoid going through this loop if possible */
 				keep = V.slaves.some(slave => {
 					/* have we impregnated a slave that is not ourselves? */
-					return (slave.ID !== ID && isImpregnatedBy(slave, removedSlave))
+					return (slave.ID !== ID && isImpregnatedBy(slave, removedSlave));
 				});
 			}
 			if (!keep) {
@@ -349,9 +348,9 @@ window.removeNonNGPSlave = function removeNonNGPSlave(removedSlave) {
 				slaveName: removedSlave.slaveName,
 				slaveSurname: removedSlave.slaveSurname,
 				fullName: SlaveFullName(removedSlave),
-				dick : removedSlave.dick,
-				vagina : removedSlave.vagina,
-				ID : V.missingParentID
+				dick: removedSlave.dick,
+				vagina: removedSlave.vagina,
+				ID: V.missingParentID
 			};
 			V.missingParentID--;
 		}
diff --git a/src/js/rulesAssistant.js b/src/js/rulesAssistant.js
index 5d6c2d3ca92433d4f9850394b7f6798c2c4aba5f..9a3d5fc2088be7cdb1593a848d65e360201436e1 100644
--- a/src/js/rulesAssistant.js
+++ b/src/js/rulesAssistant.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
 /** @param {App.Entity.SlaveState} slave */
 window.hasSurgeryRule = function (slave, rules) {
 	return rules.some(
@@ -62,7 +61,7 @@ window.RAFacilityRemove = function RAFacilityRemove(slave, rule) {
 	const V = State.variables;
 	let r = "";
 	if (!rule.facilityRemove) return r;
-	switch(rule.setAssignment) {
+	switch (rule.setAssignment) {
 		case "be confined in the arcade":
 			if (slave.assignment === rule.setAssignment) {
 				r += `<br>${slave.slaveName} has been removed from ${V.arcadeName} and has been assigned to ${rule.removalAssignment}.`;
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index 3cf916222e14d4b0e09045be4d12512fb00d773c..e605baafcd2d3dfd28c0b5d21508782c7fc0a003 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -1,11 +1,13 @@
 window.Beauty = (function() {
 	"use strict";
-	const V = State.variables;
-	const arcology = V.arcologies[0];
+	let V;
+	let arcology;
 	let beauty;
 
 	/** @param {App.Entity.SlaveState} slave */
 	function Beauty(slave) {
+		V = State.variables;
+		arcology = V.arcologies[0];
 		V.modScore = SlaveStatsChecker.modScore(slave);
 
 		beauty = 120;
diff --git a/src/js/slaveStatsChecker.js b/src/js/slaveStatsChecker.js
index f1893d1ae125c776592a215d186e397bf7d26b23..b88a492d73a69d0a67d0dbe0fb368e908656f06d 100644
--- a/src/js/slaveStatsChecker.js
+++ b/src/js/slaveStatsChecker.js
@@ -153,11 +153,10 @@ window.isPure = /** @param {App.Entity.SlaveState} slave */ function(slave) {
 window.isFullyPotent = /** @param {App.Entity.SlaveState} slave */ function(slave) {
 	if (!slave) {
 		return null;
-	} else if (slave.dick > 0 && slave.balls > 0 && slave.ballType !== 'sterile' && slave.hormoneBalance < 100 && slave.drugs !== 'hormone blockers') {
+	} else if (slave.dick > 0 && slave.balls > 0 && slave.ballType !== "sterile" && slave.hormoneBalance < 100 && slave.drugs !== "hormone blockers") {
 		return true;
-	} else {
-		return false;
 	}
+	return false;
 };
 
 window.canGetPregnant = /** @param {App.Entity.SlaveState} slave */ function(slave) {
@@ -171,9 +170,8 @@ window.canGetPregnant = /** @param {App.Entity.SlaveState} slave */ function(sla
 		return true;
 	} else if ((slave.mpreg === 1) && (canDoAnal(slave))) { /* pregmod */
 		return true;
-	} else {
-		return false;
 	}
+	return false;
 };
 
 /** contraceptives (.preg === -1) do not negate this function
@@ -205,19 +203,17 @@ window.isFertile = function(slave) {
 		return true; /* pregmod end */
 	} else if (slave.ovaries === 1) {
 		return true;
-	} else {
-		return false;
 	}
+	return false;
 };
 
 window.canAchieveErection = /** @param {App.Entity.SlaveState} slave */ 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') {
+	} else if (slave.dick < 7 && slave.dick > 0 && slave.drugs !== "hormone blockers" && (slave.balls > 0 ? slave.hormoneBalance < 100 : slave.hormoneBalance <= -100) && slave.ballType !== "sterile") {
 		return true;
-	} else {
-		return false;
 	}
+	return false;
 };
 
 window.canPenetrate = /** @param {App.Entity.SlaveState} slave */ function(slave) {
@@ -238,9 +234,8 @@ window.canSee = /** @param {App.Entity.SlaveState} slave */ function(slave) {
 		return null;
 	} else if (slave.eyes > -2) {
 		return true;
-	} else {
-		return false;
 	}
+	return false;
 };
 
 window.canHear = /** @param {App.Entity.SlaveState} slave */ function(slave) {
@@ -248,9 +243,8 @@ window.canHear = /** @param {App.Entity.SlaveState} slave */ function(slave) {
 		return null;
 	} else if ((slave.hears > -2) && (slave.earwear !== "deafening ear plugs")) {
 		return true;
-	} else {
-		return false;
 	}
+	return false;
 };
 
 window.canSmell = /** @param {App.Entity.SlaveState} slave */ function(slave) {
@@ -258,9 +252,8 @@ window.canSmell = /** @param {App.Entity.SlaveState} slave */ function(slave) {
 		return null;
 	} else if (slave.smells > -1) {
 		return true;
-	} else {
-		return false;
 	}
+	return false;
 };
 
 window.canTaste = /** @param {App.Entity.SlaveState} slave */ function(slave) {
@@ -268,9 +261,8 @@ window.canTaste = /** @param {App.Entity.SlaveState} slave */ function(slave) {
 		return null;
 	} else if (slave.tastes > -1) {
 		return true;
-	} else {
-		return false;
 	}
+	return false;
 };
 
 window.canWalk = /** @param {App.Entity.SlaveState} slave */ function(slave) {
@@ -298,9 +290,8 @@ window.canWalk = /** @param {App.Entity.SlaveState} slave */ function(slave) {
 		return true;
 	} else if (slave.shoes === "boots") {
 		return true;
-	} else {
-		return false;
 	}
+	return false;
 };
 
 window.canTalk = /** @param {App.Entity.SlaveState} slave */ function(slave) {
@@ -320,9 +311,8 @@ window.canTalk = /** @param {App.Entity.SlaveState} slave */ function(slave) {
 		return false;
 	} else if (slave.collar === "bit gag") {
 		return false;
-	} else {
-		return true;
 	}
+	return true;
 };
 
 window.canDoAnal = /** @param {App.Entity.SlaveState} slave */ function(slave) {
@@ -356,9 +346,8 @@ window.tooFatSlave = /** @param {App.Entity.SlaveState} slave */ function(slave)
 		return true;
 	} else if (slave.weight > 185+(slave.muscles/10) && slave.physicalAge < 18) {
 		return true;
-	} else {
-		return false;
 	}
+	return false;
 };
 
 window.tooBigBreasts = /** @param {App.Entity.SlaveState} slave */ function(slave) {
@@ -372,9 +361,8 @@ window.tooBigBreasts = /** @param {App.Entity.SlaveState} slave */ function(slav
 		return true;
 	} else if (slave.boobs > 20000+(slave.muscles*50) && slave.physicalAge < 18) {
 		return true;
-	} else {
-		return false;
 	}
+	return false;
 };
 
 window.tooBigBelly = /** @param {App.Entity.SlaveState} slave */ function(slave) {
@@ -388,9 +376,8 @@ window.tooBigBelly = /** @param {App.Entity.SlaveState} slave */ function(slave)
 		return true;
 	} else if (slave.belly >= 150000+(slave.muscles*800) && slave.physicalAge <= 12) {
 		return true;
-	} else {
-		return false;
 	}
+	return false;
 };
 
 window.tooBigBalls = /** @param {App.Entity.SlaveState} slave */ function(slave) {
@@ -402,9 +389,8 @@ window.tooBigBalls = /** @param {App.Entity.SlaveState} slave */ function(slave)
 		return true;
 	} else if (slave.balls >= 90+(slave.muscles*.7)) {
 		return true;
-	} else {
-		return false;
 	}
+	return false;
 };
 
 window.tooBigDick = /** @param {App.Entity.SlaveState} slave */ function(slave) {
@@ -416,9 +402,8 @@ window.tooBigDick = /** @param {App.Entity.SlaveState} slave */ function(slave)
 		return true;
 	} else if (slave.dick >= 68+(slave.muscles*.4)) {
 		return true;
-	} else {
-		return false;
 	}
+	return false;
 };
 
 window.tooBigButt = /** @param {App.Entity.SlaveState} slave */ function(slave) {
@@ -428,13 +413,12 @@ window.tooBigButt = /** @param {App.Entity.SlaveState} slave */ function(slave)
 		return true;
 	} else if (slave.butt > 14 && slave.physicalAge <= 12) {
 		return true;
-	} else {
-		return false;
 	}
+	return false;
 };
 
 window.isVegetable = /** @param {App.Entity.SlaveState} slave */ function(slave) {
 	slave = slave || State.variables.activeSlave;
-	if(!slave) { return false; }
-	return (slave.fetish === 'mindbroken');
+	if (!slave) { return false; }
+	return (slave.fetish === "mindbroken");
 };
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 6a238b32eca009c670d7e4b31e23cd31fe1408a0..924dbdd23d39b6c783fafff62a3c316e518a822e 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -5025,7 +5025,7 @@ App.UI.slaveSummaryList = function (passageName) {
 				listIndexContent += '</div>';
 			}
 			res.push(htag(listIndexContent, {
-				id: 'list_index' + _tableCount,
+				id: `list_index${ _tableCount}`,
 				class: 'hidden'
 			}));
 		}
@@ -5053,7 +5053,7 @@ App.UI.slaveSummaryList = function (passageName) {
 		const _tableCount = 0;
 		let slaveImagePrinted = (V.seeImages === 1) && (V.seeSummaryImages === 1);
 
-		res.push('<div id="slave_' + _Slave.ID + '" style="clear:both">');
+		res.push(`<div id="slave_${ _Slave.ID }" style="clear:both">`);
 
 		switch (passageName) {
 			case "Main":
@@ -5723,12 +5723,12 @@ App.UI.slaveSummaryList = function (passageName) {
 				continue;
 			case "HG Select":
 				if (setup.HGCareers.includes(_Slave.career) || (_Slave.skillHG >= V.masteredXP)) {
-					res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+					res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 					res.push('@@.lime;Has applicable career experience.@@');
 				}
 				break;
 			case "Head Girl Suite":
-				res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+				res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 				if (V.Flag === 0) {
 					res.push(`[[Send her to live with your Head Girl|Assign][$i = ${_ssi}]]`);
 				} else {
@@ -5737,18 +5737,18 @@ App.UI.slaveSummaryList = function (passageName) {
 				break;
 			case "Recruiter Select":
 				if (setup.recruiterCareers.includes(_Slave.career) || (_Slave.skillRC >= V.masteredXP)) {
-					res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+					res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 					res.push('@@.lime;Has applicable career experience.@@');
 				}
 				break;
 			case "BG Select":
 				if (setup.bodyguardCareers.includes(_Slave.career) || (_Slave.skillBG >= V.masteredXP)) {
-					res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+					res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 					res.push('@@.lime;Has applicable career experience.@@');
 				}
 				break;
 			case "Spa":
-				res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+				res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 				if (V.Flag === 0) {
 					res.push(`<<link "Send ${_Slave.object} to $spaName" "Assign">><<set $i = ${_ssi}>><</link>>`);
 				} else if (V.Flag === 1) {
@@ -5759,12 +5759,12 @@ App.UI.slaveSummaryList = function (passageName) {
 				break;
 			case "Attendant Select":
 				if (setup.attendantCareers.includes(_Slave.career) || (_Slave.skillAT >= V.masteredXP)) {
-					res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+					res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 					res.push('@@.lime;Has applicable career experience.@@');
 				}
 				break;
 			case "Nursery":
-				res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+				res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 				if (V.Flag === 0) {
 					res.push(`<<link "Send ${_Slave.object} to $nurseryName" "Assign">><<set $i = ${_ssi}>><</link>>`);
 				} else if (V.Flag === 1) {
@@ -5775,12 +5775,12 @@ App.UI.slaveSummaryList = function (passageName) {
 				break;
 			case "Matron Select":
 				if (setup.matronCareers.includes(_Slave.career) || (_Slave.skillMT >= V.masteredXP)) {
-					res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+					res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 					res.push('@@.lime;Has applicable career experience.@@');
 				}
 				break;
 			case "Brothel":
-				res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+				res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 				if (V.Flag === 0) {
 					res.push(`<<link "Send ${_Slave.object} to $brothelName" "Assign">><<set $i = ${_ssi}>><</link>>`);
 				} else if (V.Flag === 1) {
@@ -5791,12 +5791,12 @@ App.UI.slaveSummaryList = function (passageName) {
 				break;
 			case "Madam Select":
 				if (setup.madamCareers.includes(_Slave.career) || (_Slave.skillMD >= V.masteredXP)) {
-					res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+					res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 					res.push('@@.lime;Has applicable career experience.@@');
 				}
 				break;
 			case "Club":
-				res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+				res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 				if (V.Flag === 0) {
 					res.push(`<<link "Send ${_Slave.object} to $clubName" "Assign">><<set $i = ${_ssi}>><</link>>`);
 				} else if (V.Flag === 1) {
@@ -5806,7 +5806,7 @@ App.UI.slaveSummaryList = function (passageName) {
 				}
 				break;
 			case "Arcade":
-				res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+				res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 				if (V.Flag === 0) {
 					res.push(`<<link "Confine ${_Slave.object} in $arcadeName" "Assign">><<set $i = ${_ssi}>><</link>>`);
 				} else {
@@ -5815,12 +5815,12 @@ App.UI.slaveSummaryList = function (passageName) {
 				break;
 			case "DJ Select":
 				if (setup.DJCareers.includes(_Slave.career) || (_Slave.skillDJ >= V.masteredXP)) {
-					res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+					res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 					res.push('@@.lime;Has applicable career experience.@@');
 				}
 				break;
 			case "Clinic":
-				res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+				res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 				if (V.clinicUpgradeScanner === 1) {
 					res.push(`@@.cyan;Estimated DNA error value: ${Math.ceil(_Slave.chem / 10)}@@`);
 				}
@@ -5834,12 +5834,12 @@ App.UI.slaveSummaryList = function (passageName) {
 				break;
 			case "Nurse Select":
 				if (setup.nurseCareers.includes(_Slave.career) || (_Slave.skillNU >= V.masteredXP)) {
-					res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+					res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 					res.push('@@.lime;Has applicable career experience.@@');
 				}
 				break;
 			case "Schoolroom":
-				res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+				res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 				if (V.Flag === 0) {
 					res.push(`<<link "Assign ${_Slave.object} to $schoolroomName" "Assign">><<set $i = ${_ssi}>><</link>>`);
 				} else if (V.Flag === 1) {
@@ -5850,12 +5850,12 @@ App.UI.slaveSummaryList = function (passageName) {
 				break;
 			case "Schoolteacher Select":
 				if (setup.schoolteacherCareers.includes(_Slave.career) || (_Slave.skillTE >= V.masteredXP)) {
-					res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+					res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 					res.push('@@.lime;Has applicable career experience.@@');
 				}
 				break;
 			case "Dairy":
-				res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+				res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 				if (V.Flag === 0) {
 					res.push(`<<link "Send ${_Slave.object} to $dairyName" "Assign">><<set $i = ${_ssi}>><</link>>`);
 				} else if (V.Flag === 1) {
@@ -5866,12 +5866,12 @@ App.UI.slaveSummaryList = function (passageName) {
 				break;
 			case "Milkmaid Select":
 				if (setup.milkmaidCareers.includes(_Slave.career) || (_Slave.skillMM >= V.masteredXP)) {
-					res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+					res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 					res.push('@@.lime;Has applicable career experience.@@');
 				}
 				break;
 			case "Farmyard":
-				res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+				res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 				if (V.Flag === 0) {
 					res.push(`<<link "Send ${_Slave.object} to $farmyardName" "Assign">><<set $i = ${_ssi}>><</link>>`);
 				} else if (V.Flag === 1) {
@@ -5882,12 +5882,12 @@ App.UI.slaveSummaryList = function (passageName) {
 				break;
 			case "Farmer Select":
 				if (setup.farmerCareers.includes(_Slave.career) || (_Slave.skillFA >= V.masteredXP)) {
-					res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+					res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 					res.push('@@.lime;Has applicable career experience.@@');
 				}
 				break;
 			case "Servants' Quarters":
-				res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+				res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 				if (V.Flag === 0) {
 					res.push(`<<link "Assign ${_Slave.object} to $servantsQuartersName" "Assign">><<set $i = ${_ssi}>><</link>>`);
 				} else if (V.Flag === 1) {
@@ -5898,12 +5898,12 @@ App.UI.slaveSummaryList = function (passageName) {
 				break;
 			case "Stewardess Select":
 				if (setup.stewardessCareers.includes(_Slave.career) || (_Slave.skillST >= V.masteredXP)) {
-					res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+					res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 					res.push('@@.lime;Has applicable career experience.@@');
 				}
 				break;
 			case "Master Suite":
-				res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+				res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 				if (V.Flag === 0) {
 					res.push(`<<link "Add ${_Slave.object} to $masterSuiteName" "Assign">><<set $i = ${_ssi}>><</link>>`);
 				} else if (V.Flag === 1) {
@@ -5913,7 +5913,7 @@ App.UI.slaveSummaryList = function (passageName) {
 				}
 				break;
 			case "Cellblock":
-				res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+				res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 				if (V.Flag === 0) {
 					res.push(`<<link "Confine ${_Slave.object} in $cellblockName" "Assign">><<set $i = ${_ssi}>><</link>>`);
 				} else if (V.Flag === 1) {
@@ -5924,12 +5924,12 @@ App.UI.slaveSummaryList = function (passageName) {
 				break;
 			case "Wardeness Select":
 				if (setup.wardenessCareers.includes(_Slave.career) || (_Slave.skillWA >= V.masteredXP)) {
-					res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+					res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 					res.push('@@.lime;Has applicable career experience.@@');
 				}
 				break;
 			case "New Game Plus":
-				res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+				res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 				if (V.Flag === 0) {
 					res.push(`<<link "Add to import list" "New Game Plus">>
 							<<set $slavesToImport += 1,$Flag = 1>>
@@ -5943,11 +5943,11 @@ App.UI.slaveSummaryList = function (passageName) {
 				}
 				break;
 			case "Matchmaking":
-				res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+				res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 				res.push(`[[Match them|Matchmaking][$subSlave = $slaves[${_ssi}]]]`);
 				break;
 			case "Dinner Party Preparations":
-				res.push('<br>' + (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
+				res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '');
 				res.push(`[[Make her the main course|Dinner Party Execution][$activeSlave = $slaves[${_ssi}]]]`);
 				break;
 		}
diff --git a/src/uncategorized/futureSociety.tw b/src/uncategorized/futureSociety.tw
index 876212c02681ef5ae7246a1ab783df2f47a63300..f24441902c34e9beb9b4e00299e31e53c88e0f20 100644
--- a/src/uncategorized/futureSociety.tw
+++ b/src/uncategorized/futureSociety.tw
@@ -605,6 +605,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			//With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
 		<</if>>
 	<</if>>
+	<br>
 <<else>>
 	<<if $FSCredits > 0>>
 		<br>[[Racial Supremacism|Future Society][$arcologies[0].FSSupremacist = 4, $FSCredits -= 1]]: a belief in <<if $arcologies[0].FSSupremacistRace == 0>>the superiority of a chosen race<<else>>$arcologies[0].FSSupremacistRace superiority<</if>>.
@@ -634,6 +635,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			//With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
 		<</if>>
 	<</if>>
+	<br>
 <<else>>
 	<<if $FSCredits > 0>>
 		<br>''''[[Racial Subjugationism|Future Society][$arcologies[0].FSSubjugationist = 4, $FSCredits -= 1]]: a belief in <<if $arcologies[0].FSSubjugationistRace == 0>>the inferiority of a chosen race<<else>>$arcologies[0].FSSubjugationistRace inferiority<</if>>.
@@ -650,13 +652,12 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 		<<if $arcologies[0].FSSupremacist != "unset" && $arcologies[0].FSSupremacistRace == "southern european">>//It is established that southern europeaners are superior//<<elseif $arcologies[0].FSSubjugationistRace != "southern european">>[[Southern European|Future Society][$arcologies[0].FSSubjugationistRace = "southern european"]]<<else>>Southern European<</if>> |
 		<<if $arcologies[0].FSSupremacist != "unset" && $arcologies[0].FSSupremacistRace == "semitic">>//It is established that semites are superior//<<elseif $arcologies[0].FSSubjugationistRace != "semitic">>[[Semitic|Future Society][$arcologies[0].FSSubjugationistRace = "semitic"]]<<else>>Semitic<</if>> |
 		<<if $arcologies[0].FSSupremacist != "unset" && $arcologies[0].FSSupremacistRace == "mixed race">>//It is established that those with mixed blood are superior//<<elseif $arcologies[0].FSSubjugationistRace != "mixed race">>[[Mixed Race|Future Society][$arcologies[0].FSSubjugationistRace = "mixed race"]]<<else>>Mixed Race<</if>>
+		<br>
 	<<else>>
 		/*//''Racial Subjugationism'': a belief in the inferiority of a subject race.//*/
 	<</if>>
 <</if>>
 
-<br>
-
 <<if $seePreg != 0>>
 	<<if $arcologies[0].FSRestart == "unset">>
 		<<if $arcologies[0].FSRepopulationFocus != "unset">>
@@ -668,6 +669,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 					//With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
 				<</if>>
 			<</if>>
+			<br>
 		<<else>>
 			<<if ($FSCredits > 0)>>
 				<br>''''[[Repopulation Efforts|Future Society][$arcologies[0].FSRepopulationFocus = 4+$arcologies[0].FSRepopulationFocusInterest-$arcologies[0].FSEugenicsInterest, $FSCredits -= 1, $arcologies[0].FSRepopulationFocusPregPolicy = 0, $arcologies[0].FSRepopulationFocusMilfPolicy = 0]]: focus on mass breeding in order to repopulate the future world.
@@ -699,9 +701,10 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 					<</if>>
 				<</if>>
 			<</if>>
+			<br>
 		<<else>>
 			<<if ($FSCredits > 0)>>
-				<br>''''[[Eugenics|Future Society][$arcologies[0].FSRestart = 4+$arcologies[0].FSEugenicsInterest-$arcologies[0].FSRepopulationFocusInterest, $FSCredits -= 1, $arcologies[0].FSRepopulationFocusPregPolicy = 0, $arcologies[0].FSRepopulationFocusMilfPolicy = 0]]: rebuilding society using restrictive breeding programs reserved solely for society's finest.
+				<br>''''[[Eugenics|Future Society][$arcologies[0].FSRestart = 4+$arcologies[0].FSEugenicsInterest-$arcologies[0].FSRepopulationFocusInterest, $FSCredits -= 1, $arcologies[0].FSRepopulationFocusPregPolicy = 0, $arcologies[0].FSRepopulationFocusMilfPolicy = 0]]: rebuilding society using restrictive breeding programs reserved solely for society's finest.<br>
 			<<else>>
 				/*//''Complete Societal Reconstruction'': rebuilding society based off the elite.//*/
 			<</if>>
@@ -709,8 +712,6 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 	<</if>>
 <</if>>
 
-<br>
-
 <<if $seeDicks != 0 || $makeDicks == 1>>
 	<<if $arcologies[0].FSGenderFundamentalist == "unset">>
 		<<if $arcologies[0].FSGenderRadicalist != "unset">>
@@ -722,6 +723,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 					//With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
 				<</if>>
 			<</if>>
+			<br>
 		<<else>>
 			<<if $FSCredits > 0>>
 				<br>''''[[Gender radicalism|Future Society][$arcologies[0].FSGenderRadicalist = 4, $FSCredits -= 1]]: a radical redefinition of gender that identifies powerful people as male, and everyone else as female.
@@ -742,17 +744,16 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				//With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
 			<</if>>
 		<</if>>
+		<br>
 	<<else>>
 		<<if $FSCredits > 0>>
-			<br>''''[[Gender traditionalism|Future Society][$arcologies[0].FSGenderFundamentalist = 4, $FSCredits -= 1]]: a societal preference for feminine slaves<<if $seePreg != 0>> and support for slave pregnancy<</if>>.
+			<br>''''[[Gender traditionalism|Future Society][$arcologies[0].FSGenderFundamentalist = 4, $FSCredits -= 1]]: a societal preference for feminine slaves<<if $seePreg != 0>> and support for slave pregnancy<</if>>.<br>
 		<<else>>
 			/*//''Gender traditionalism'': a societal preference for feminine slaves<<if $seePreg != 0>> and support for slave pregnancy<</if>>.//*/
 		<</if>>
 	<</if>>
 <</if>>
 
-<br>
-
 <<if $arcologies[0].FSDegradationist == "unset">>
 	<<if $arcologies[0].FSPaternalist != "unset">>
 		<br>''You are pursuing'' a vision of slave improvement, including slaves' health, mental well-being, and education.
@@ -763,9 +764,10 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				//With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
 			<</if>>
 		<</if>>
+		<br>
 	<<else>>
 		<<if $FSCredits > 0>>
-			<br>''''[[Paternalism|Future Society][$arcologies[0].FSPaternalist = 4, $FSCredits -= 1]]: a vision of slave improvement, including slaves' health, mental well-being, and education.
+			<br>''''[[Paternalism|Future Society][$arcologies[0].FSPaternalist = 4, $FSCredits -= 1]]: a vision of slave improvement, including slaves' health, mental well-being, and education.<br>
 		<<else>>
 			/*//''Paternalism'': a vision of slave improvement, including slaves' health, mental well-being, and education.//*/
 		<</if>>
@@ -782,17 +784,16 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				//With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
 			<</if>>
 		<</if>>
+		<br>
 	<<else>>
 		<<if $FSCredits > 0>>
-			<br>''''[[Degradationism|Future Society][$arcologies[0].FSDegradationist = 4, $FSCredits -= 1]]: a belief that slaves are not human and should not be treated decently.
+			<br>''''[[Degradationism|Future Society][$arcologies[0].FSDegradationist = 4, $FSCredits -= 1]]: a belief that slaves are not human and should not be treated decently.<br>
 		<<else>>
 			/*//''Degradation'': a belief that slaves are not human and should not be treated decently.//*/
 		<</if>>
 	<</if>>
 <</if>>
 
-<br>
-
 <<if $arcologies[0].FSTransformationFetishist == "unset">>
 	<<if $arcologies[0].FSBodyPurist != "unset">>
 		<br>''You are pursuing'' societal disapproval of implant surgery.
@@ -803,6 +804,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				//With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
 			<</if>>
 		<</if>>
+		<br>
 	<<else>>
 		<<if $FSCredits > 0>>
 			<br>''''[[Body Purism|Future Society][$arcologies[0].FSBodyPurist = 4, $FSCredits -= 1]]: societal disapproval of implant surgery.
@@ -822,17 +824,16 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				//With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
 			<</if>>
 		<</if>>
+		<br>
 	<<else>>
 		<<if ($FSCredits > 0)>>
-			<br>''''[[Transformation Fetishism|Future Society][$arcologies[0].FSTransformationFetishist = 4, $FSCredits -= 1]]: societal fetishization of implant surgery.
+			<br>''''[[Transformation Fetishism|Future Society][$arcologies[0].FSTransformationFetishist = 4, $FSCredits -= 1]]: societal fetishization of implant surgery.<br>
 		<<else>>
 			/*//''Transformation Fetishism'': societal fetishization of implant surgery.//*/
 		<</if>>
 	<</if>>
 <</if>>
 
-<br>
-
 <<if $arcologies[0].FSMaturityPreferentialist == "unset">>
 	<<if $arcologies[0].FSYouthPreferentialist != "unset">>
 		<br>''You are pursuing'' an accentuated societal preference for younger slaves.
@@ -843,6 +844,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				//With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
 			<</if>>
 		<</if>>
+		<br>
 	<<else>>
 		<<if $FSCredits > 0>>
 			<br>''''[[Youth Preferentialism|Future Society][$arcologies[0].FSYouthPreferentialist = 4, $FSCredits -= 1]]: increased interest in girls just past their majority.
@@ -862,17 +864,16 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				//With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
 			<</if>>
 		<</if>>
+		<br>
 	<<else>>
 		<<if $FSCredits > 0>>
-			<br>''''[[Maturity Preferentialism|Future Society][$arcologies[0].FSMaturityPreferentialist = 4, $FSCredits -= 1]]: increased interest in mature slaves.
+			<br>''''[[Maturity Preferentialism|Future Society][$arcologies[0].FSMaturityPreferentialist = 4, $FSCredits -= 1]]: increased interest in mature slaves.<br>
 		<<else>>
 			/*//''Maturity Preferentialism'': increased interest in mature slaves.//*/
 		<</if>>
 	<</if>>
 <</if>>
 
-<br>
-
 <<if $arcologies[0].FSAssetExpansionist == "unset">>
 	<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>
 		<br>''You are supporting'' enthusiasm for slaves with girlish figures.
@@ -883,6 +884,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				//With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
 			<</if>>
 		<</if>>
+		<br>
 	<<else>>
 		<<if $FSCredits > 0>>
 			<br>''''[[Slimness Enthusiasm|Future Society][$arcologies[0].FSSlimnessEnthusiast = 4, $FSCredits -= 1]]: a fashion for slaves with girlish figures.
@@ -902,17 +904,16 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				//With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
 			<</if>>
 		<</if>>
+		<br>
 	<<else>>
 		<<if $FSCredits > 0>>
-			<br>''''[[Asset Expansionism|Future Society][$arcologies[0].FSAssetExpansionist = 4, $FSCredits -= 1]]: societal hunger for huge assets of whatever origin.
+			<br>''''[[Asset Expansionism|Future Society][$arcologies[0].FSAssetExpansionist = 4, $FSCredits -= 1]]: societal hunger for huge assets of whatever origin.<br>
 		<<else>>
 			/*//''Asset Expansionism'': societal hunger for huge assets of whatever origin.//*/
 		<</if>>
 	<</if>>
 <</if>>
 
-<br>
-
 <<if $arcologies[0].FSPastoralist != "unset">>
 	<br>''You are pursuing'' societal normalization of slave milking.
 	//<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSPastoralist")>><<if $assistantFSAppearance == "pastoralist">><<set $assistantFSAppearance = "default">><</if>><</link>>//<br>&nbsp;&nbsp;&nbsp;&nbsp;
@@ -922,16 +923,15 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			//With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
 		<</if>>
 	<</if>>
+	<br>
 <<else>>
 	<<if $FSCredits > 0>>
-		<br>''''[[Slave Pastoralism|Future Society][$arcologies[0].FSPastoralist = 4, $FSCredits -= 1]]: societal acceptance of slave products like milk.
+		<br>''''[[Slave Pastoralism|Future Society][$arcologies[0].FSPastoralist = 4, $FSCredits -= 1]]: societal acceptance of slave products like milk.<br>
 	<<else>>
 		/*//''Slave Pastoralism'': societal acceptance of slave products like milk.//*/
 	<</if>>
 <</if>>
 
-<br>
-
 <<if $arcologies[0].FSHedonisticDecadence == "unset">>
 	<<if $arcologies[0].FSPhysicalIdealist != "unset">>
 		<br>''You are pursuing'' societal reverence for the idealized human form, including height, health and muscle.
@@ -942,6 +942,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				//With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
 			<</if>>
 		<</if>>
+		<br>
 	<<else>>
 		<<if $FSCredits > 0>>
 			<br>''''[[Physical Idealism|Future Society][$arcologies[0].FSPhysicalIdealist = 4, $FSCredits -= 1]]: societal reverence for the idealized human form, including height, health and muscle.
@@ -961,17 +962,16 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				//With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
 			<</if>>
 		<</if>>
+		<br>
 	<<else>>
 		<<if $FSCredits > 0>>
-			<br>''''[[Hedonistic Decadence|Future Society][$arcologies[0].FSHedonisticDecadence = 4, $FSCredits -= 1]]: societal acceptance of overindulgence and immediate gratification. Be it food, drink, sex, drugs or whatever one's desire may be.
+			<br>''''[[Hedonistic Decadence|Future Society][$arcologies[0].FSHedonisticDecadence = 4, $FSCredits -= 1]]: societal acceptance of overindulgence and immediate gratification. Be it food, drink, sex, drugs or whatever one's desire may be.<br>
 		<<else>>
 			/*//''HedonisticDecadence'': societal acceptance of over indulgence, particularly of food, drink, sex and drugs.//*/
 		<</if>>
 	<</if>>
 <</if>>
 
-<br>
-
 <<if $arcologies[0].FSNull == "unset">>
 	<<if $arcologies[0].FSChattelReligionist != "unset">>
 		<br>''You are pursuing'' a new strain of religion that emphasizes the slaveholding portions of religious history.
@@ -982,6 +982,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				//With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
 			<</if>>
 		<</if>>
+		<br>
 	<<else>>
 		<<if $FSCredits > 0>>
 			<br>''''[[Chattel Religionism|Future Society][$arcologies[0].FSChattelReligionist = 4, $FSCredits -= 1]]: a new strain of religion that emphasizes the slaveholding portions of religious history.
@@ -1005,10 +1006,11 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 					<br>&nbsp;&nbsp;&nbsp;&nbsp;[[Advance|Future Society][$arcologies[0].FSNull += 25, $FSCredits -= 1]]: further commitment to allow your arcology's citizens cultural freedom.
 				<</if>>
 			<</if>>
+			<br>
 		<<else>>
 			<<if $FSCredits > 0>>
 				<br>[[Multiculturalism|Future Society][$arcologies[0].FSNull = 25, $FSCredits -= 1]]: a commitment to allow your arcology's citizens cultural freedom.
-				<br>&nbsp;&nbsp;&nbsp;&nbsp;//This option is an alternative to societal advancement, and will not advance naturally.//
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;//This option is an alternative to societal advancement, and will not advance naturally.//<br>
 			<</if>>
 		<</if>>
 	<<elseif $FSCreditCount == 6>>
@@ -1024,10 +1026,11 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 					<br>&nbsp;&nbsp;&nbsp;&nbsp;[[Advance|Future Society][$arcologies[0].FSNull += 17, $FSCredits -= 1]]: further commitment to allow your arcology's citizens cultural freedom.
 				<</if>>
 			<</if>>
+			<br>
 		<<else>>
 			<<if $FSCredits > 0>>
 				<br>[[Multiculturalism|Future Society][$arcologies[0].FSNull = 17, $FSCredits -= 1]]: a commitment to allow your arcology's citizens cultural freedom.
-				<br>&nbsp;&nbsp;&nbsp;&nbsp;//This option is an alternative to societal advancement, and will not advance naturally.//
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;//This option is an alternative to societal advancement, and will not advance naturally.//<br>
 			<</if>>
 		<</if>>
 	<<elseif $FSCreditCount == 7>>
@@ -1043,10 +1046,11 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 					<br>&nbsp;&nbsp;&nbsp;&nbsp;[[Advance|Future Society][$arcologies[0].FSNull += 15, $FSCredits -= 1]]: further commitment to allow your arcology's citizens cultural freedom.
 				<</if>>
 			<</if>>
+			<br>
 		<<else>>
 			<<if $FSCredits > 0>>
 				<br>[[Multiculturalism|Future Society][$arcologies[0].FSNull = 15, $FSCredits -= 1]]: a commitment to allow your arcology's citizens cultural freedom.
-				<br>&nbsp;&nbsp;&nbsp;&nbsp;//This option is an alternative to societal advancement, and will not advance naturally.//
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;//This option is an alternative to societal advancement, and will not advance naturally.//<br>
 			<</if>>
 		<</if>>
 	<<else>>
@@ -1062,17 +1066,16 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 					<br>&nbsp;&nbsp;&nbsp;&nbsp;[[Advance|Future Society][$arcologies[0].FSNull += 20, $FSCredits -= 1]]: further commitment to allow your arcology's citizens cultural freedom.
 				<</if>>
 			<</if>>
+			<br>
 		<<else>>
 			<<if $FSCredits > 0>>
 				<br>[[Multiculturalism|Future Society][$arcologies[0].FSNull = 20, $FSCredits -= 1]]: a commitment to allow your arcology's citizens cultural freedom.
-				<br>&nbsp;&nbsp;&nbsp;&nbsp;//This option is an alternative to societal advancement, and will not advance naturally.//
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;//This option is an alternative to societal advancement, and will not advance naturally.//<br>
 			<</if>>
 		<</if>>
 	<</if>>
 <</if>>
 
-<br>
-
 <<if ($arcologies[0].FSAztecRevivalist == "unset") && ($arcologies[0].FSEgyptianRevivalist == "unset") && ($arcologies[0].FSEdoRevivalist == "unset") && ($arcologies[0].FSArabianRevivalist == "unset") && ($arcologies[0].FSChineseRevivalist == "unset")>>
 	<<if $arcologies[0].FSRomanRevivalist != "unset">>
 		<br>''You are pursuing'' a vision of a new Rome.