diff --git a/devTools/types/assistant.d.ts b/devTools/types/assistant.d.ts
index 767cbfe6b6d780732a115fbd414ac52b7a03d6de..9d0729f420f450793519ae5103e0d3d5c70e6bf2 100644
--- a/devTools/types/assistant.d.ts
+++ b/devTools/types/assistant.d.ts
@@ -7,7 +7,8 @@ interface assistant {
 	personality: -1 | 0 | 1;
 	name: string;
 	power: number;
-	fsOptions: 1 | 0;
+	fsOptions: FC.Bool;
+	options: FC.Bool;
 	market: {
 		relationship: "nonconsensual" | "incestuous" | "cute" | "romantic";
 		limit: number;
diff --git a/js/medicine/surgery/reaction/pLimbInterface3.js b/js/medicine/surgery/reaction/pLimbInterface3.js
index 43fc3fcb9cf35af4f31085732c3ca21ad978bd61..475ac751248a1475aa2e3a820578570c5ba5ab86 100644
--- a/js/medicine/surgery/reaction/pLimbInterface3.js
+++ b/js/medicine/surgery/reaction/pLimbInterface3.js
@@ -16,9 +16,9 @@
 			r.push(`installed in ${his} stumps. ${His} stumps twitch slightly as the software begins configuring. Since ${he} already had anchors installed in previous surgery this procedure was less invasive and thus <span class="health dec">${his} health has been only slightly affected.</span>`);
 			if (slave.fetish !== "mindbroken" && slave.fuckdoll === 0) {
 				if (slave.devotion > 20) {
-					r.push(`${He} is <span class="devotion inc">overjoyed</span> when ${he} finds out this upgrade will allow ${him} to //feel// with ${his} limbs again and thanks you profusely the first chance ${he} gets. ${He} <span class="trust inc">places more trust in you,</span> too, since you obviously have ${his} best interests at heart.`);
+					r.push(`${He} is <span class="devotion inc">overjoyed</span> when ${he} finds out this upgrade will allow ${him} to <i>feel</i> with ${his} limbs again and thanks you profusely the first chance ${he} gets. ${He} <span class="trust inc">places more trust in you,</span> too, since you obviously have ${his} best interests at heart.`);
 				} else if (slave.devotion >= -20) {
-					r.push(`${He}'s <span class="devotion inc">overwhelmed with joy and gratitude,</span> when ${he} finds out this upgrade will allow ${him} to //feel// with ${his} limbs again, in part because ${he} didn't think you'd do something like this for ${him}. ${He} thanks you profusely the first chance ${he} gets and is determined to prove ${himself} worthy of the expense you went to for ${him}. ${He} <span class="trust inc">places more trust in you,</span> too, since you seem to have a plan for ${him}.`);
+					r.push(`${He}'s <span class="devotion inc">overwhelmed with joy and gratitude,</span> when ${he} finds out this upgrade will allow ${him} to <i>feel</i> with ${his} limbs again, in part because ${he} didn't think you'd do something like this for ${him}. ${He} thanks you profusely the first chance ${he} gets and is determined to prove ${himself} worthy of the expense you went to for ${him}. ${He} <span class="trust inc">places more trust in you,</span> too, since you seem to have a plan for ${him}.`);
 				} else {
 					r.push(`Despite ${his} hatred of you, ${he} can't help but feel some <span class="trust inc">trust</span> and <span class="devotion inc">gratitude,</span> towards you, since you clearly have a plan that involves putting a good deal of value into ${him}. Your goals might not be ${hers}, but at least ${he} has an indication that you're not toying with ${him}.`);
 				}
diff --git a/src/005-passages/managePassages.js b/src/005-passages/managePassages.js
index 6d74d4e33f585e07baa6e071339ba3b6047541e4..461a50c97ccbde043a66889fba171855ed7eeea6 100644
--- a/src/005-passages/managePassages.js
+++ b/src/005-passages/managePassages.js
@@ -151,7 +151,7 @@ new App.DomPassage("Prosthetic Lab",
 		V.nextButton = "Back";
 		V.nextLink = "Manage Penthouse";
 		return App.UI.prostheticLab();
-	}
+	}, ["jump-to-safe", "jump-from-safe"]
 );
 
 new App.DomPassage("Gene Lab",
diff --git a/src/endWeek/economics/personalNotes.js b/src/endWeek/economics/personalNotes.js
index 08a9bea9f6a532bfd78b2f4a358d1e3768a84f4c..c6c90c2090955ae10183eeccc5bec6e6307c94ac 100644
--- a/src/endWeek/economics/personalNotes.js
+++ b/src/endWeek/economics/personalNotes.js
@@ -302,7 +302,7 @@ App.EndWeek.personalNotes = function() {
 				if (V.PC.pregAdaptation < 500) {
 					miscarriageChance = -10;
 					miscarriageChance += ((V.PC.bellyPreg / 1000) - V.PC.pregAdaptation);
-					r.push(` // this could use to not be linear`);
+					// this could use to not be linear
 					if (V.PC.inflation > 0) {
 						miscarriageChance += 10;
 					}
@@ -423,12 +423,12 @@ App.EndWeek.personalNotes = function() {
 				}
 				if (V.seeExtreme === 1) {
 					if (miscarriage !== 1 && V.PC.bellyPreg >= 100000 && V.PC.geneMods.rapidCellGrowth !== 1) {
-						r.push(` // If ${he} can't relieve the pressure that way, will ${he} hold?`);
+						// If he can't relieve the pressure that way, will he hold?
 						if (V.PC.bellyPreg >= 500000 || V.PC.wombImplant !== "restraint") {
 							if ((V.PC.belly > (V.PC.pregAdaptation * 3200)) || V.PC.bellyPreg >= 500000) {
 								burstChance = -80;
 								burstChance += ((V.PC.belly / 1000) - V.PC.pregAdaptation);
-								r.push(` // this could use to not be linear`);
+								// this could use to not be linear
 								if (V.PC.health.health < -20) {
 									burstChance -= (V.PC.health.health);
 								} else if (V.PC.health.health > 80) {
diff --git a/src/endWeek/saLongTermMentalEffects.js b/src/endWeek/saLongTermMentalEffects.js
index 3a6dd3c03238e6a8200c7c7fb8b4c24bf6d25e0c..abdbd4002001649bb838180e17a41f6300c5593f 100644
--- a/src/endWeek/saLongTermMentalEffects.js
+++ b/src/endWeek/saLongTermMentalEffects.js
@@ -1020,7 +1020,7 @@ App.SlaveAssignment.longTermMentalEffects = (function() {
 					}
 				} else if (slave.behavioralFlaw === "hates men") {
 					if (slave.fetish === "pregnancy") {
-						r.push(`${He} dislikes the company of men, but fetishizes pregnancy; ${he} decides that men, those hunky impregnators, can't be //that// bad, and <span class="flaw break">gets over ${his} hatred.</span>`);
+						r.push(`${He} dislikes the company of men, but fetishizes pregnancy; ${he} decides that men, those hunky impregnators, can't be <i>that</i> bad, and <span class="flaw break">gets over ${his} hatred.</span>`);
 						slave.behavioralFlaw = "none";
 					} else if (slave.fetish === "boobs") {
 						r.push(`${He} dislikes the company of men and adores boobs; ${he} finds that ${he} doesn't mind ogling titties with the boys, and <span class="flaw break">gets over ${his} hatred.</span>`);
@@ -1034,10 +1034,10 @@ App.SlaveAssignment.longTermMentalEffects = (function() {
 					}
 				} else if (slave.behavioralFlaw === "hates women") {
 					if (slave.fetish === "pregnancy") {
-						r.push(`${He} dislikes the company of women, but fetishizes pregnancy; ${he} decides that women, with their motherly hips and fertile cunts, can't be //that// bad, and <span class="flaw break">gets over ${his} hatred.</span>`);
+						r.push(`${He} dislikes the company of women, but fetishizes pregnancy; ${he} decides that women, with their motherly hips and fertile cunts, can't be <i>that<i> bad, and <span class="flaw break">gets over ${his} hatred.</span>`);
 						slave.behavioralFlaw = "none";
 					} else if (slave.fetish === "cumslut") {
-						r.push(`${He} dislikes the company of women and has a real oral fixation; ${he} decides that women, with their soft, kissable lips can't be //that// bad, and <span class="flaw break">gets over ${his} hatred.</span>`);
+						r.push(`${He} dislikes the company of women and has a real oral fixation; ${he} decides that women, with their soft, kissable lips can't be <i>that<i> bad, and <span class="flaw break">gets over ${his} hatred.</span>`);
 						slave.behavioralFlaw = "none";
 					} else if (slave.attrXX > 85) {
 						r.push(`${He} dislikes the company of women but likes fucking them; ${he} gets used to putting up with girls to get into their pants, and <span class="flaw break">gets over ${his} hatred.</span>`);
diff --git a/src/events/PE/peAssociatesPublicSlut.js b/src/events/PE/peAssociatesPublicSlut.js
index 691abcd4eeb759766f8cd164741c85f337d35144..e537cbfcf28b9b52adb1a010b92dc46aad0627a5 100644
--- a/src/events/PE/peAssociatesPublicSlut.js
+++ b/src/events/PE/peAssociatesPublicSlut.js
@@ -31,21 +31,21 @@ App.Events.PEAssociatesPublicSlut = class PEAssociatesPublicSlut extends App.Eve
 		}
 
 		if (_num < V.seeDicks) {
-			r.push(`The one restraining him is a business associate of yours. She's a beautiful woman who cuts a gorgeous figure in her expensive, tasteful business attire. You have some rapport with one another and she greets you cheerily and you make small talk as she finishes up shackling her newly minted slave. He was, she explains, her boyfriend, who had accrued significant debt due to his severe lack of business sense and tact. She had bought out his debt in order to save him from enslavement, only to find out not long after that he had been cheating on her with another free woman. Since she owned his debt, it took only a few formalities to turn him into her property as revenge. "Since he likes sluts so much, I'm going to turn him into one!" She giggles, while stroking the struggling traps luxurious bleach blonde hair. Her eyes light up as her gaze returns to you. You know what's coming, and are surprised it took this long for it to occur to her. She reaches around her slave and spreads his ass cheeks. "`);
+			r.push(`The one restraining him is a business associate of yours. She's a beautiful woman who cuts a gorgeous figure in her expensive, tasteful business attire. You have some rapport with one another and she greets you cheerily and you make small talk as she finishes up shackling her newly minted slave. He was, she explains, her boyfriend, who had accrued significant debt due to his severe lack of business sense and tact. She had bought out his debt in order to save him from enslavement, only to find out not long after that he had been cheating on her with another free woman. Since she owned his debt, it took only a few formalities to turn him into her property as revenge. "Since he likes sluts so much, I'm going to turn him into one!" She giggles, while stroking the struggling traps luxurious bleach blonde hair. Her eyes light up as her gaze returns to you. You know what's coming, and are surprised it took this long for it to occur to her. She reaches around her slave and spreads his ass cheeks.`);
 			if (V.PC.title === 1) {
-				r.push(`Sir,`);
+				r.push(`"Sir,`);
 			} else {
-				r.push(`Ma'am,`);
+				r.push(`"Ma'am,`);
 			}
 			r.push(`it would honor me if you fucked him!"`);
 
 			r.push(`You consider the slave's anus. Your associate has clearly spent all day customizing her new toy, it looks freshly bleached and is smooth and inviting. It effectively has been transformed into a sex organ.`);
 		} else {
-			r.push(`The one restraining her is a business associate of yours. He's a well built man who cuts a handsome figure in his expensive, tasteful business attire. You have some rapport with one another and he greets you cheerily and you make small talk as he finishes up shackling his newly minted slave. She was, he explains, his girlfriend, who had accrued significant debt due to her severe lack of business sense and tact. He had bought out her debt in order to save her from enslavement, only to find out not long after that she had been cheating on him with another free man. Since he owned her debt, it took only a few formalities to turn her into his property as revenge. "She was already a slut, I've simply made her look the part, and play it more honestly!" he chuckles, while fondling the struggling bimbo's ample ass. He favors you with a rueful smile as his gaze returns to you. You know what's coming, and are surprised it took this long for it to occur to him. He reaches around his slave and spreads her ass cheeks. "`);
+			r.push(`The one restraining her is a business associate of yours. He's a well built man who cuts a handsome figure in his expensive, tasteful business attire. You have some rapport with one another and he greets you cheerily and you make small talk as he finishes up shackling his newly minted slave. She was, he explains, his girlfriend, who had accrued significant debt due to her severe lack of business sense and tact. He had bought out her debt in order to save her from enslavement, only to find out not long after that she had been cheating on him with another free man. Since he owned her debt, it took only a few formalities to turn her into his property as revenge. "She was already a slut, I've simply made her look the part, and play it more honestly!" he chuckles, while fondling the struggling bimbo's ample ass. He favors you with a rueful smile as his gaze returns to you. You know what's coming, and are surprised it took this long for it to occur to him. He reaches around his slave and spreads her ass cheeks.`);
 			if (V.PC.title === 1) {
-				r.push(`Sir,`);
+				r.push(`"Sir,`);
 			} else {
-				r.push(`Ma'am,`);
+				r.push(`"Ma'am,`);
 			}
 			r.push(`it would honor me if you fucked her! I've had her hymen restored just a few hours ago, first time is all yours if you want it."`);
 
diff --git a/src/events/intro/economyIntro.js b/src/events/intro/economyIntro.js
index e359c06b05b484a9bd04a678981e0d04f45a48b8..328a8c9f19f4b24b47090a616d8edb5ec56c3e35 100644
--- a/src/events/intro/economyIntro.js
+++ b/src/events/intro/economyIntro.js
@@ -1,6 +1,5 @@
 App.Intro.economyIntro = function() {
 	const node = new DocumentFragment();
-	// :: Economy Intro [nobr]
 
 	App.Events.addParagraph(node, [
 		`It is the year 2037, and the past 21 years have not been kind. The world is starting to fall apart. The climate is deteriorating, resources are being exhausted, and there are more people to feed every year. Technology is advancing, but not fast enough to save everyone. <span class="intro question"></span>`,
diff --git a/src/events/intro/extremeIntro.js b/src/events/intro/extremeIntro.js
index 97877f834d4077c4146de7f56aed5cb94dca7b3f..e84a13d5136865d6fc8de35e806ae021ad981dd6 100644
--- a/src/events/intro/extremeIntro.js
+++ b/src/events/intro/extremeIntro.js
@@ -1,6 +1,5 @@
 App.Intro.extremeIntro = function() {
 	const node = new DocumentFragment();
-	// :: :: Extreme Intro [nobr]
 
 	App.Events.addParagraph(node, [
 		`The early Free Cities were wild places where the writ of law did not run. In some of the most depraved, slaves' bodies, minds and even lives were playthings of the wealthy and powerful. Though modern Free Cities are tremendously varied, a majority of the new communities made a choice about whether extreme practices were a flaw in a lawless society or one of its benefits.`,
diff --git a/src/events/intro/locationIntro.js b/src/events/intro/locationIntro.js
index 179f4c1636de765d6cd59ce5657790b562ef1666..881d4d3489b9de513c6a1edc9f363590dbc5363d 100644
--- a/src/events/intro/locationIntro.js
+++ b/src/events/intro/locationIntro.js
@@ -1,5 +1,4 @@
 App.Intro.locationIntro = function() {
-	// :: Location Intro
 	const node = new DocumentFragment();
 
 	App.Events.addParagraph(node, [
diff --git a/src/events/intro/pcAppearanceIntro.js b/src/events/intro/pcAppearanceIntro.js
index 82cefc77e27c4a39910e0bd2721fc940d1a3728d..aef96691f639e2dc0f03aa73e53bd4b237f855d8 100644
--- a/src/events/intro/pcAppearanceIntro.js
+++ b/src/events/intro/pcAppearanceIntro.js
@@ -1,6 +1,6 @@
 App.Intro.PCAppearanceIntro = function() {
 	const node = new DocumentFragment();
-	// :: PC Appearance Intro [nobr]
+
 	node.append(
 		`Race and appearance are largely irrelevant in the Free Cities; there are only the free and the enslaved.`,
 		App.UI.DOM.makeElement("div", `Appearance only, will mostly have a superficial effect (unless you make a big deal out of it).`, ["indent", "note"])
diff --git a/src/events/intro/pcPregIntro.js b/src/events/intro/pcPregIntro.js
index c88aee7211753fe7468c040cae790ef7889f7255..8cbb7742aef7f313e941aa2aafcbab4eab632b2c 100644
--- a/src/events/intro/pcPregIntro.js
+++ b/src/events/intro/pcPregIntro.js
@@ -1,6 +1,5 @@
 App.Intro.PCPregIntro = function() {
 	const node = new DocumentFragment();
-	// :: PC Preg Intro [nobr]
 
 	App.Events.addParagraph(node, [
 		`You have a working female reproductive system, and thus, a menstrual cycle. Women already face hardships as slaveowners and arcology owners, and being with child, coupled with a strong societal aversion to the dominant being penetrated, leads most pregnant owners to find themselves in dire situations. As an added precaution, since nothing stops an owner from hooking up with another owner, contraceptives are common amongst free women.`,
diff --git a/src/events/intro/slaveAgeIntro.js b/src/events/intro/slaveAgeIntro.js
index 570e53552460281e0b487103fb6b390ee02ec317..974393450cd8fa2e517763fa6dc2dd5f0ac13e15 100644
--- a/src/events/intro/slaveAgeIntro.js
+++ b/src/events/intro/slaveAgeIntro.js
@@ -1,6 +1,5 @@
 App.Intro.slaveAgeIntro = function() {
 	const node = new DocumentFragment();
-	// :: Slave Age Intro [nobr]
 
 	App.UI.DOM.appendNewElement("p", node, `Do you want to see content involving girls younger than 18 in this game?`, ["intro", "question"]);
 
diff --git a/src/events/intro/tradeIntro.js b/src/events/intro/tradeIntro.js
index ef7f39db17c74be9390096cf03f6e27f3c49be34..58199ce6856ce6756287f67088c198bb8351a130 100644
--- a/src/events/intro/tradeIntro.js
+++ b/src/events/intro/tradeIntro.js
@@ -1,6 +1,5 @@
 App.Intro.tradeIntro = function() {
 	const node = new DocumentFragment();
-	// :: Trade Intro [nobr]
 
 	App.Events.addParagraph(node, [
 		`Most of the Free Cities are run on radically libertarian or even anarcho-capitalist principles. The first Free Cities experimented with indentured servitude, and this rapidly developed into widespread slavery. By now, the Free Cities collectively are a fundamentally slaveowning society and maintain a thriving slave trade that feeds off the terrible conditions in parts of the old world.`,
diff --git a/src/events/nonRandom/pSchoolSuggestion.js b/src/events/nonRandom/pSchoolSuggestion.js
index 23234c7cd44b43850b96c180c231fb9e75602b9d..cc0f1b16cdfd8d05dc7a639a1ed07abe51e4972b 100644
--- a/src/events/nonRandom/pSchoolSuggestion.js
+++ b/src/events/nonRandom/pSchoolSuggestion.js
@@ -23,7 +23,7 @@ App.Events.PSchoolSuggestion = class PSchoolSuggestion extends App.Events.BaseEv
 
 		if (V.seeDicks !== 100) {
 			App.Events.addParagraph(node, [`"The Slave School for me," says a portly man with a thriving slave breaking business down in the markets. "Their girls are pretty, skilled, and innocent, without any of that weird crap the other schools go in for. Besides, all that special stuff drives up the prices. TSS girls are cheap for what you get. When you're tired of one, just buy another." He turns to his friend and business partner, a much thinner man. "Though I'm sure you disagree with me."`]);
-			App.Events.addParagraph(node, [`"Of course I do, we've been having this debate every day for ten years." The thin man laughs. "Hasn't hurt our company, though. Anyway, I'm a GRI man. It's much harder to change a girl's body than it is to train her mind. The Growth Research Institute might sell their girls with no training and some nasty flaws, but you can fix those faster than you can grow a well-trained skinny girl's tits out to //here//," and he gestures far out in front of his own chest.`]);
+			App.Events.addParagraph(node, [`"Of course I do, we've been having this debate every day for ten years." The thin man laughs. "Hasn't hurt our company, though. Anyway, I'm a GRI man. It's much harder to change a girl's body than it is to train her mind. The Growth Research Institute might sell their girls with no training and some nasty flaws, but you can fix those faster than you can grow a well-trained skinny girl's tits out to <i>here</i>," and he gestures far out in front of his own chest.`]);
 
 			App.Events.addParagraph(node, [`An older woman standing across from him sniffs. "St. Claver's knows how to do both. They train them right, and if they aren't perfectly made, well, that's what plastic surgery is for." She favors the group with a sharp smile. "The best part is that between the silicone and their, ahem, strict training, they're all the same. Once you get used to their girls, you can always rely on them to give you more of what you like."`]);
 		}
@@ -36,12 +36,14 @@ App.Events.PSchoolSuggestion = class PSchoolSuggestion extends App.Events.BaseEv
 			App.Events.addParagraph(node, [`The unusually competent young heiress standing next to him snickers. "If you're going to bring up refinement, um, hello, the Futanari Sisters. I have four futas in my apartment having sex with each other right now. How do I know? Because they're always having sex with each other. They never stop." Her eyes take on a faraway look and she pauses. "Um, haha, I know what I'm doing later."`]);
 		}
 
-		App.Events.addParagraph(node, [`"If you like them soft and mellow, you got to go with The Cattle Ranch," a buff man blurts loudly while slamming down his empty mug. "I've got a pair of 'em for my bedroom; they are so loving after a good milking. Taste good too." His drinking buddy retorts, "Too much work is what they are. They might as well be animals with how they act.${(V.seePreg === 0) ? "In addition, hope you like pregnant pussies, 'cause you need to keep them gravid or their milk dries up." : ""}"`]);
+		App.Events.addParagraph(node, [`"If you like them soft and mellow, you got to go with The Cattle Ranch," a buff man blurts loudly while slamming down his empty mug. "I've got a pair of 'em for my bedroom; they are so loving after a good milking. Taste good too." His drinking buddy retorts, "Too much work is what they are. They might as well be animals with how they act.${(V.seePreg === 0) ? " In addition, hope you like pregnant pussies, 'cause you need to keep them gravid or their milk dries up." : ""}"`]);
 
-		App.Events.addParagraph(node, [`"I see good taste is scarce within this walls," suddenly stated a young man previously quiet in his corner. "I say quality and strength is where the game should be played and there's nothing better than the girls from the Hippolyta Academy.`]);
+		App.Events.addParagraph(node, [`"I see good taste is scarce within this walls," suddenly stated a young man previously quiet in his corner. "I say quality and strength is where the game should be played and there's nothing better than the girls from the Hippolyta Academy."`]);
 
 		App.Events.addParagraph(node, [`The older gentleman who seems to have been acting as unofficial moderator before you came in turns to you. "In any case, ${(V.PC.title === 1) ? "sir" : "madam"}, we agreed before you came in. We'd like to get together and pay half the cost of encouraging a slave school to set up a branch campus here, if you'd be willing to pay the other half and choose which. I think ${cashFormat(startFee)} from you would cover it." He looks around the group. "Before we started this little debate, we all agreed to chip in regardless of which you chose."`]);
 
+		App.UI.DOM.appendNewElement("div", node, `Selecting a school will cost ${cashFormat(startFee)} and add minor upkeep costs`, "note");
+
 		const choices = [];
 		if (V.seeDicks !== 100) {
 			choices.push(new App.Events.Result(`The Slave School`, TSS));
@@ -61,8 +63,6 @@ App.Events.PSchoolSuggestion = class PSchoolSuggestion extends App.Events.BaseEv
 		}
 		App.Events.addResponses(node, choices);
 
-		App.UI.DOM.appendNewElement("div", node, `Selecting a school will cost ${cashFormat(startFee)}and add minor upkeep costs`, "note");
-
 		function TSS() {
 			V.TSS.schoolPresent = 1;
 			cashX(-startFee, "policies");
diff --git a/src/facilities/dairy/industrialDairyAssignmentScene.js b/src/facilities/dairy/industrialDairyAssignmentScene.js
index d50fed9fd816b4499338a790403c3e76d30d03d9..13d1f92185c3f4b339aed9c2d37a565490428b29 100644
--- a/src/facilities/dairy/industrialDairyAssignmentScene.js
+++ b/src/facilities/dairy/industrialDairyAssignmentScene.js
@@ -1,5 +1,4 @@
 App.Facilities.Dairy.industrialAssignmentScene = function(slave) {
-// :: Industrial Dairy Assignment Scene [nobr]
 	const node = new DocumentFragment();
 
 	V.nextButton = "Continue";
diff --git a/src/facilities/penthouse/HGSelect.js b/src/facilities/penthouse/HGSelect.js
index 1edf1ac610825548a7d8c4680d1466a39c890579..ff8fc97c4511b233f7a7b4b04f18f25181705ffb 100644
--- a/src/facilities/penthouse/HGSelect.js
+++ b/src/facilities/penthouse/HGSelect.js
@@ -27,7 +27,8 @@ App.Facilities.HGSelect = function() {
 		[], "Main"
 		));
 
-		App.UI.DOM.appendNewElement("div", f, `Slave training	${HGName} will prioritize enabled items in the following order`, "bold");
+		App.UI.DOM.appendNewElement("div", f, `Slave training`, "bold");
+		App.UI.DOM.appendNewElement("div", f, `${HGName} will prioritize enabled items in the following order`, "note");
 
 		div.append(App.UI.DOM.makeCheckbox("headGirlTrainsHealth"), " Health");
 		App.UI.DOM.appendNewElement("div", f, div, "indent");
@@ -37,30 +38,30 @@ App.Facilities.HGSelect = function() {
 		App.UI.DOM.appendNewElement("div", f, div, "indent");
 
 		if (V.headGirlTrainsFlaws) {
-			r.push(`${HGName} will train flaws.`,);
+			r.push(`${HGName} will remove flaws.`,);
 		} else if (V.headGirlSoftensFlaws) {
-			r.push(`${HGName} will softern flaws into quirks.`);
+			r.push(`${HGName} will soften flaws into quirks.`);
 		} else if (V.headGirlOverridesQuirks) {
 			r.push(`${HGName} will override quirks.`);
 		} else {
 			r.push(`${HGName} will ignore flaws.`);
 		}
 
-		links.push(App.UI.DOM.link(" Override quirks", () => {
+		links.push(App.UI.DOM.link("Override quirks", () => {
 			V.headGirlTrainsFlaws = 0;
 			V.headGirlSoftensFlaws = 0;
 			V.headGirlOverridesQuirks = 1;
 		},
 		[], passage()
 		));
-		links.push(App.UI.DOM.link(" Soften flaws", () => {
+		links.push(App.UI.DOM.link("Soften flaws", () => {
 			V.headGirlTrainsFlaws = 0;
 			V.headGirlSoftensFlaws = 1;
 			V.headGirlOverridesQuirks = 0;
 		},
 		[], passage()
 		));
-		links.push(App.UI.DOM.link(" Train flaws", () => {
+		links.push(App.UI.DOM.link("Remove flaws", () => {
 			V.headGirlTrainsFlaws = 1;
 			V.headGirlSoftensFlaws = 0;
 			V.headGirlOverridesQuirks = 0;
@@ -68,7 +69,7 @@ App.Facilities.HGSelect = function() {
 		[], passage()
 		));
 
-		links.push(App.UI.DOM.link(" Ignore flaws", () => {
+		links.push(App.UI.DOM.link("Ignore flaws", () => {
 			V.headGirlTrainsFlaws = 0;
 			V.headGirlSoftensFlaws = 0;
 			V.headGirlOverridesQuirks = 0;
@@ -92,7 +93,7 @@ App.Facilities.HGSelect = function() {
 		r = [];
 		if (V.HGSeverity === 1) {
 			r.push(`${HGName} will be <span class="bold">aggressive</span> when punishing, with rape strongly encouraged.`);
-			r.push(App.UI.DOM.link(" Moderate", () => {
+			r.push(App.UI.DOM.link("Moderate", () => {
 				V.HGSeverity = 0;
 			},
 			[], passage()
@@ -100,12 +101,12 @@ App.Facilities.HGSelect = function() {
 		} else if (V.HGSeverity === 0) {
 			links = [];
 			r.push(`${HGName} will be <span class="bold">moderate</span> when punishing, carefully selecting appropriate consequences.`);
-			links.push(App.UI.DOM.link(" Be aggressive", () => {
+			links.push(App.UI.DOM.link("Be aggressive", () => {
 				V.HGSeverity = 1;
 			},
 			[], passage()
 			));
-			links.push(App.UI.DOM.link(` Apply restrictions`, () => {
+			links.push(App.UI.DOM.link(`Apply restrictions`, () => {
 				V.HGSeverity = -1;
 			},
 			[], passage()
@@ -113,7 +114,7 @@ App.Facilities.HGSelect = function() {
 			r.push(App.UI.DOM.generateLinksStrip(links));
 		} else if (V.HGSeverity === -1) {
 			r.push(`${HGName} will be <span class="bold">respectful</span> when punishing, treating slaves decently.`);
-			r.push(App.UI.DOM.link(" Be stricter", () => {
+			r.push(App.UI.DOM.link("Be stricter", () => {
 				V.HGSeverity = 0;
 			},
 			[], passage()
@@ -124,14 +125,14 @@ App.Facilities.HGSelect = function() {
 		r = [];
 		if (V.HGPiercings === 1) {
 			r.push(`${HGName} is <span class="bold">allowed</span> to use piercings as a tool to improve slaves' attitudes.`);
-			r.push(App.UI.DOM.link(" Disallow", () => {
+			r.push(App.UI.DOM.link("Disallow", () => {
 				V.HGPiercings = 0;
 			},
 			[], passage()
 			));
 		} else {
 			r.push(`${HGName} is <span class="bold">not allowed</span> to use piercings as a tool to improve slaves' attitudes.`);
-			r.push(App.UI.DOM.link(" Allow", () => {
+			r.push(App.UI.DOM.link("Allow", () => {
 				V.HGPiercings = 1;
 			},
 			[], passage()
@@ -143,14 +144,14 @@ App.Facilities.HGSelect = function() {
 		App.UI.DOM.appendNewElement("div", f, "Behavior towards you: ", "underline");
 		if (V.HGFormality === 1) {
 			r.push(`${HGName} will be <span class="bold">formal:</span> you will always be called ${getWrittenTitle(S.HeadGirl)}, just like any other slave.`);
-			r.push(App.UI.DOM.link(" Allow private informality", () => {
+			r.push(App.UI.DOM.link("Allow private informality", () => {
 				V.HGFormality = 0;
 			},
 			[], passage()
 			));
 		} else {
 			r.push(`${HGName} is allowed to be <span class="bold">informal:</span> in private, you can be called ${properTitle()}.`);
-			r.push(App.UI.DOM.link(" Maintain complete formality", () => {
+			r.push(App.UI.DOM.link("Maintain complete formality", () => {
 				V.HGFormality = 1;
 			},
 			[], passage()
diff --git a/src/facilities/surgery/analyzePlayerPregnancy.js b/src/facilities/surgery/analyzePlayerPregnancy.js
index 809cadc7cc45064e0c3eb4112683a06521d6b69b..ff456972edb5265cb52d19c5ce95d9828b7501ea 100644
--- a/src/facilities/surgery/analyzePlayerPregnancy.js
+++ b/src/facilities/surgery/analyzePlayerPregnancy.js
@@ -1,5 +1,4 @@
 App.UI.analyzePCPregnancy = function() {
-	//:: Analyze PC Pregnancy [nobr]
 	const node = new DocumentFragment();
 
 	if (lastVisited("Incubator") === 1) {
diff --git a/src/interaction/prostheticLabPassage.js b/src/interaction/prostheticLabPassage.js
index 80770e48122410aab6ef8fdf2de93bb6a6abcec1..fa3fe066c363e507cabb4c94c7e583dd82dd6f10 100644
--- a/src/interaction/prostheticLabPassage.js
+++ b/src/interaction/prostheticLabPassage.js
@@ -1,5 +1,4 @@
 App.UI.prostheticLab = function() {
-	// :: Prosthetic Lab [nobr jump-to-safe jump-from-safe]
 	const node = new DocumentFragment();
 
 	let r = [];
diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index ba91c31f00c6b6e3bbc786f9793cf476c4dd98c3..ff36dd101d77058e1e66f2ee7cf7c60247ae1638 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -702,9 +702,6 @@ globalThis.populateEventArray = function(RESS = V.RESSevent.length, RESSTR = V.R
 	for (i = 0; i < RECI; i++) {
 		events.push("RECI");
 	}
-	if (events.length === 0) {
-		events.push("RE no event");
-	}
 
 	return events;
 };
diff --git a/src/npc/generate/newChildIntro.js b/src/npc/generate/newChildIntro.js
index d501e8c3e9976862eac1d7113739b7639c6b5b0a..763ce2783be107b570fb188e4be0232a8b94408f 100644
--- a/src/npc/generate/newChildIntro.js
+++ b/src/npc/generate/newChildIntro.js
@@ -23,7 +23,7 @@ App.UI.newChildIntro = function(slave) {
 		} else if (slave.geneticQuirks.neoteny && slave.actualAge > 12 && V.geneticMappingUpgrade < 2) {
 		}
 	} else if (slave.geneticQuirks.progeria && V.geneticMappingUpgrade < 2) {
-		r.push(`you barely manage to pull yourself together to catch ${him} in time. There must have been some mistake with the settings; ${he} should not be //this// old. You help ${him} to ${his} unstable feet and slowly walk ${him} to your penthouse.`);
+		r.push(`you barely manage to pull yourself together to catch ${him} in time. There must have been some mistake with the settings; ${he} should not be <i>this</i> old. You help ${him} to ${his} unstable feet and slowly walk ${him} to your penthouse.`);
 	} else if (slave.geneticQuirks.neoteny && slave.actualAge > 12 && V.geneticMappingUpgrade === 0) {
 		r.push(`you have to make sure the right ${girl} was released. ${He} was supposed to be ${slave.actualAge}, not this child sitting before you. You double check the machine's logs to be certain and it turns out ${he} really is ${slave.actualAge}, just abnormally young looking for ${his} age.`);
 	} else {
diff --git a/src/personalAssistant/assistantOptions.js b/src/personalAssistant/assistantOptions.js
index 507314620d1fa786dce26ba47b000bf5b7559461..946a370fd9f653c89c3a9d0867468970501afe49 100644
--- a/src/personalAssistant/assistantOptions.js
+++ b/src/personalAssistant/assistantOptions.js
@@ -44,7 +44,7 @@ App.UI.personalAssistantOptions = function() {
 	tabBar.addTab("Computer Core Upgrades", "upgrades", upgrades());
 	if (V.week >= 11) {
 		tabBar.addTab("Settings", "settings", settings());
-		if (V.assistant.personality !== 0) {
+		if (V.assistant.personality !== 0 && V.assistant.options) {
 			tabBar.addTab("Appearance", "appearance", appearance());
 		}
 	}
@@ -281,11 +281,11 @@ App.UI.personalAssistantOptions = function() {
 				}
 			}
 			App.UI.DOM.appendNewElement("div", frag, App.UI.DOM.generateLinksStrip(linkArray));
-		}
 
-		if (V.seeImages) {
-			App.UI.DOM.appendNewElement("h3", node, "Custom Image");
-			node.append(customAssistantImage());
+			if (V.seeImages && V.seeAvatar) {
+				App.UI.DOM.appendNewElement("h3", node, "Custom Image");
+				node.append(customAssistantImage());
+			}
 		}
 
 		return frag;