diff --git a/src/gui/Encyclopedia/encyclopediaFetish.js b/src/gui/Encyclopedia/encyclopediaFetish.js
index 8dbb94ef720818e4ea3dcf42cb5ba5094ec82412..89ed83729daee9f49ea5346bfe4b2695e07076ab 100644
--- a/src/gui/Encyclopedia/encyclopediaFetish.js
+++ b/src/gui/Encyclopedia/encyclopediaFetish.js
@@ -219,7 +219,7 @@ App.Encyclopedia.addArticle("Submissives", function() {
 
 	r.push("Submissiveness will soften the", App.Encyclopedia.link("arrogant", "Arrogant"), "flaw into", App.UI.DOM.combineNodes(App.Encyclopedia.link("confident", "Confident"), ","),
 		"the", App.Encyclopedia.link("apathetic", "Apathetic"), "flaw into", App.UI.DOM.combineNodes(App.Encyclopedia.link("caring", "Caring"), ","),
-		"and the", App.Encyclopedia.link("idealistic", "Idealilstic"), "flaw into", App.UI.DOM.combineNodes(App.Encyclopedia.link("romantic", "Romantic"), ","),
+		"and the", App.Encyclopedia.link("idealistic", "Idealistic"), "flaw into", App.UI.DOM.combineNodes(App.Encyclopedia.link("romantic", "Romantic"), ","),
 		"or remove these flaws if a quirk is already present. The fetish will increase XY attraction. It improves performance at the servant assignment and working in the Servants' Quarters. Attendants do better when submissive, and can become submissives naturally.");
 	r.toParagraph();
 
diff --git a/src/gui/Encyclopedia/encyclopediaSlaveFlaws.js b/src/gui/Encyclopedia/encyclopediaSlaveFlaws.js
index 7e6729e511417ec78333fe71622c91ff466783dd..27ed6840232b0b1d36f6e3b91447f1ea0d4ae8e5 100644
--- a/src/gui/Encyclopedia/encyclopediaSlaveFlaws.js
+++ b/src/gui/Encyclopedia/encyclopediaSlaveFlaws.js
@@ -3,7 +3,7 @@ App.Encyclopedia.addArticle("Flaws", function() {
 	const r = new SpacedTextAccumulator(f);
 	r.push(App.UI.DOM.makeElement("span", "Flaws", ["bold"]), "are negative slave qualities.");
 	r.push("They decrease slaves' value and performance at sexual assignments, and each flaw also has other, differing effects. Each flaw is associated with a corresponding");
-	r.push(App.Encyclopedia.link("quirk", "Quirks"), ", and slave can have two flaws (a sexual flaw and a behavioral flaw), just like quirks. New slaves will often have flaws, and tough experiences can also cause them to appear.");
+	r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("quirk", "Quirks"), ","), "and each slave can have two flaws (a sexual flaw and a behavioral flaw), just like quirks. New slaves will often have flaws, and tough experiences can also cause them to appear.");
 	r.toParagraph();
 
 	r.push("Flaws can softened or removed either by orders given to the", App.Encyclopedia.link("Head Girl"), "or via personal attention provided by the player character.");
@@ -29,7 +29,7 @@ App.Encyclopedia.addArticle("Arrogant", function() {
 	const r = new SpacedTextAccumulator(f);
 	r.push(App.UI.DOM.makeElement("span", "Arrogant", ["bold"]), "is a behavioral", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
 	r.push(App.Encyclopedia.link("confident"), App.UI.DOM.combineNodes(App.Encyclopedia.link("quirk", "Quirks"), "."));
-	r.push("The", App.Encyclopedia.link("submissive", "Submissives"), "fetish fetish can do this naturally.");
+	r.push("The", App.Encyclopedia.link("submissive", "Submissives"), "fetish can do this naturally.");
 	r.push("In addition to the standard penalties to value and performance on sexual assignments, weekly", App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "gains are limited.");
 	r.toNode("div");
 
@@ -43,7 +43,7 @@ App.Encyclopedia.addArticle("Bitchy", function() {
 	const r = new SpacedTextAccumulator(f);
 	r.push(App.UI.DOM.makeElement("span", "Bitchy", ["bold"]), "is a behavioral", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
 	r.push(App.Encyclopedia.link("cutting"), App.UI.DOM.combineNodes(App.Encyclopedia.link("quirk", "Quirks"), "."));
-	r.push("The", App.Encyclopedia.link("humiliation", "Humiliation Fetishists"), "fetish fetish can do this naturally.");
+	r.push("The", App.Encyclopedia.link("humiliation", "Humiliation Fetishists"), "fetish can do this naturally.");
 	r.push("In addition to the standard penalties to value and performance on sexual assignments, weekly", App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "gains are limited.");
 	r.toNode("div");
 
@@ -78,7 +78,7 @@ App.Encyclopedia.addArticle("Hates men", function() {
 	const r = new SpacedTextAccumulator(f);
 	r.push(App.UI.DOM.makeElement("span", "Hates men", ["bold"]), "is a behavioral", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
 	r.push(App.Encyclopedia.link("adores women"), App.Encyclopedia.link("quirk", "Quirks"), "by training,");
-	r.push("a good", App.Encyclopedia.link("Attendant"), ", a powerful sex drive, or the", App.Encyclopedia.link("boob fetish.", "Boob Fetishists"));
+	r.push("a good", App.UI.DOM.combineNodes(App.Encyclopedia.link("Attendant"), ","), "a powerful sex drive, or the", App.Encyclopedia.link("boob fetish.", "Boob Fetishists"));
 	r.push("Strong attraction to men or the", App.Encyclopedia.link("pregnancy fetish", "Pregnancy Fetishists"), "will soften it so she", App.Encyclopedia.link("adores men"), "instead.");
 	r.push("This flaw can also be removed by serving a player character or another slave with a dick.");
 	r.toNode("div");
@@ -91,8 +91,8 @@ App.Encyclopedia.addArticle("Hates women", function() {
 	const r = new SpacedTextAccumulator(f);
 	r.push(App.UI.DOM.makeElement("span", "Hates women", ["bold"]), "is a behavioral", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
 	r.push(App.Encyclopedia.link("adores men"), App.Encyclopedia.link("quirk", "Quirks"), "by training,");
-	r.push("a good", App.Encyclopedia.link("Attendant"), ", a powerful sex drive, or the", App.Encyclopedia.link("cumslut", "Cumsluts"), "fetish.");
-	r.push("Strong attraction to women or the", App.Encyclopedia.link("pregnancy fetish", "Pregnancy Fetishists"), "will soften it so she", App.Encyclopedia.link("Adores women"), "instead.");
+	r.push("a good", App.UI.DOM.combineNodes(App.Encyclopedia.link("Attendant"), ","), "a powerful sex drive, or the", App.Encyclopedia.link("cumslut", "Cumsluts"), "fetish.");
+	r.push("Strong attraction to women or the", App.Encyclopedia.link("pregnancy fetish", "Pregnancy Fetishists"), "will soften it so she", App.Encyclopedia.link("adores women"), "instead.");
 	r.push("This flaw can also be removed by serving a player character or another slave with a vagina.");
 	r.toNode("div");
 
@@ -104,7 +104,7 @@ App.Encyclopedia.addArticle("Liberated", function() {
 	const r = new SpacedTextAccumulator(f);
 	r.push(App.UI.DOM.makeElement("span", "Liberated", ["bold"]), "is a behavioral", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
 	r.push(App.Encyclopedia.link("advocate"), App.UI.DOM.combineNodes(App.Encyclopedia.link("quirk", "Quirks"), "."));
-	r.push("The", App.Encyclopedia.link("submissive", "Submissives"), "fetish can do this naturally.");
+	r.push("The", App.Encyclopedia.link("masochism", "Masochists"), "fetish can do this naturally.");
 	r.push("In addition to the standard penalties to value and performance on sexual assignments, weekly", App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "gains are limited.");
 	r.toNode("div");
 
@@ -116,7 +116,6 @@ App.Encyclopedia.addArticle("Odd", function() {
 	const r = new SpacedTextAccumulator(f);
 	r.push(App.UI.DOM.makeElement("span", "Odd", ["bold"]), "is a behavioral", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
 	r.push(App.Encyclopedia.link("funny"), App.UI.DOM.combineNodes(App.Encyclopedia.link("quirk", "Quirks"), "."));
-	r.push("The", App.Encyclopedia.link("humiliation", "Humiliation Fetishists"), "fetish can do this naturally.");
 	r.push("In addition to the standard penalties to value and performance on sexual assignments, weekly", App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "gains are limited.");
 	r.toParagraph();
 
@@ -128,7 +127,7 @@ App.Encyclopedia.addArticle("Apathetic", function() {
 	const r = new SpacedTextAccumulator(f);
 	r.push(App.UI.DOM.makeElement("span", "Apathetic", ["bold"]), "is a sexual", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
 	r.push(App.Encyclopedia.link("caring"), App.Encyclopedia.link("quirk", "Quirks"), "by training,");
-	r.push("a good", App.Encyclopedia.link("Attendant"), ", a powerful sex drive, or the", App.Encyclopedia.link("submissive", "Humiliation Submissive"), "fetish.");
+	r.push("a good", App.UI.DOM.combineNodes(App.Encyclopedia.link("Attendant"), ","), "a powerful sex drive, or the", App.Encyclopedia.link("submissive", "Submissives"), "fetish.");
 	r.push("It can also be removed by the", App.Encyclopedia.link("dom", "Doms"), "fetish.");
 	r.toParagraph();
 
@@ -140,7 +139,7 @@ App.Encyclopedia.addArticle("Crude", function() {
 	const r = new SpacedTextAccumulator(f);
 	r.push(App.UI.DOM.makeElement("span", "Crude", ["bold"]), "is a sexual", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
 	r.push(App.Encyclopedia.link("unflinching"), App.Encyclopedia.link("quirk", "Quirks"), "by training,");
-	r.push("a good", App.Encyclopedia.link("Attendant"), ", a powerful sex drive, or the", App.Encyclopedia.link("cumslut", "Cumsluts"), "fetish.");
+	r.push("a good", App.UI.DOM.combineNodes(App.Encyclopedia.link("Attendant"), ","), "a powerful sex drive, or the", App.Encyclopedia.link("buttslut", "Buttsluts"), "fetish.");
 	r.toParagraph();
 
 	return f;
@@ -150,8 +149,8 @@ App.Encyclopedia.addArticle("Hates anal", function() {
 	const f = new DocumentFragment();
 	const r = new SpacedTextAccumulator(f);
 	r.push(App.UI.DOM.makeElement("span", "Hates anal", ["bold"]), "is a sexual", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
-	r.push(App.Encyclopedia.link("painal queen"), App.Encyclopedia.link("quirk", "Quirks"), "by training,");
-	r.push("a good", App.Encyclopedia.link("Attendant"), ", a powerful sex drive, or the", App.Encyclopedia.link("buttslut", "Buttsluts"), "fetish.");
+	r.push(App.Encyclopedia.link("painal queen", "Painal Queen"), App.Encyclopedia.link("quirk", "Quirks"), "by training,");
+	r.push("a good", App.UI.DOM.combineNodes(App.Encyclopedia.link("Attendant"), ","), "a powerful sex drive, anus piercings, or the", App.Encyclopedia.link("buttslut", "Buttsluts"), "fetish.");
 	r.push("This flaw can also be removed by serving the player character.");
 	r.toParagraph();
 
@@ -162,8 +161,8 @@ App.Encyclopedia.addArticle("Hates oral", function() {
 	const f = new DocumentFragment();
 	const r = new SpacedTextAccumulator(f);
 	r.push(App.UI.DOM.makeElement("span", "Hates oral", ["bold"]), "is a sexual", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
-	r.push(App.Encyclopedia.link("gagfuck queen"), App.Encyclopedia.link("quirk", "Quirks"), "by training,");
-	r.push("a good", App.Encyclopedia.link("Attendant"), ", a powerful sex drive, or the", App.Encyclopedia.link("cumslut", "Cumsluts"), "fetish.");
+	r.push(App.Encyclopedia.link("gagfuck queen", "Gagfuck Queen"), App.Encyclopedia.link("quirk", "Quirks"), "by training,");
+	r.push("a good", App.UI.DOM.combineNodes(App.Encyclopedia.link("Attendant"), ","), "a powerful sex drive, tongue piercings, or the", App.Encyclopedia.link("cumslut", "Cumsluts"), "fetish.");
 	r.push("This flaw can also be removed by serving the player character.");
 	r.toParagraph();
 
@@ -174,9 +173,9 @@ App.Encyclopedia.addArticle("Hates penetration", function() {
 	const f = new DocumentFragment();
 	const r = new SpacedTextAccumulator(f);
 	r.push(App.UI.DOM.makeElement("span", "Hates penetration", ["bold"]), "is a sexual", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
-	r.push(App.Encyclopedia.link("strugglefuck queen"), App.Encyclopedia.link("quirk", "Quirks"), "by training,");
-	r.push("a good", App.Encyclopedia.link("Attendant"), ", a powerful sex drive, or the", App.Encyclopedia.link("buttslut", "Buttsluts"), "fetish.");
-	r.push("This flaw can also be removed by serving the player character.");
+	r.push(App.Encyclopedia.link("strugglefuck queen", "Strugglefuck Queen"), App.Encyclopedia.link("quirk", "Quirks"), "by training,");
+	r.push("a good", App.UI.DOM.combineNodes(App.Encyclopedia.link("Attendant"), ","), "a powerful sex drive, labia piercings, or the", App.Encyclopedia.link("buttslut", "Buttsluts"), "fetish.");
+	r.push("This flaw can also be removed by the", App.Encyclopedia.link("pregnancy fetish", "Pregnancy Fetishists"), "or by serving the player character.");
 	r.toParagraph();
 
 	return f;
@@ -187,7 +186,7 @@ App.Encyclopedia.addArticle("Idealistic", function() {
 	const r = new SpacedTextAccumulator(f);
 	r.push(App.UI.DOM.makeElement("span", "Idealistic", ["bold"]), "is a sexual", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
 	r.push(App.Encyclopedia.link("romantic"), App.Encyclopedia.link("quirk", "Quirks"), "by training,");
-	r.push("a good", App.Encyclopedia.link("Attendant"), ", a powerful sex drive, or the", App.Encyclopedia.link("submissive", "Humiliation Submissive"), "fetish.");
+	r.push("a good", App.UI.DOM.combineNodes(App.Encyclopedia.link("Attendant"), ","), "a powerful sex drive, or the", App.Encyclopedia.link("submissive", "Submissives"), "fetish.");
 	r.toParagraph();
 
 	return f;
@@ -198,7 +197,7 @@ App.Encyclopedia.addArticle("Judgemental", function() {
 	const r = new SpacedTextAccumulator(f);
 	r.push(App.UI.DOM.makeElement("span", "Judgemental", ["bold"]), "is a sexual", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
 	r.push(App.Encyclopedia.link("size queen", "Size Queen"), App.Encyclopedia.link("quirk", "Quirks"), "by training,");
-	r.push("a good", App.Encyclopedia.link("Attendant"), ", a powerful sex drive, or the", App.Encyclopedia.link("submissive", "Humiliation Submissive"), "fetish.");
+	r.push("a good", App.UI.DOM.combineNodes(App.Encyclopedia.link("Attendant"), ","), "a powerful sex drive, or the", App.Encyclopedia.link("submissive", "Submissives"), "fetish.");
 	r.toParagraph();
 
 	return f;
@@ -209,7 +208,7 @@ App.Encyclopedia.addArticle("Repressed", function() {
 	const r = new SpacedTextAccumulator(f);
 	r.push(App.UI.DOM.makeElement("span", "Repressed", ["bold"]), "is a sexual", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
 	r.push(App.Encyclopedia.link("perverted"), App.Encyclopedia.link("quirk", "Quirks"), "by training,");
-	r.push("a good", App.Encyclopedia.link("Attendant"), ", a powerful sex drive, or the", App.Encyclopedia.link("cumslut", "Cumsluts"), "fetish, or the", App.Encyclopedia.link("buttslut", "Buttsluts"), "fetish.");
+	r.push("a good", App.UI.DOM.combineNodes(App.Encyclopedia.link("Attendant"), ","), "a powerful sex drive, or the", App.Encyclopedia.link("cumslut", "Cumsluts"), "or", App.Encyclopedia.link("buttslut", "Buttsluts"), "fetishes.");
 	r.toParagraph();
 
 	return f;
@@ -220,7 +219,7 @@ App.Encyclopedia.addArticle("Shamefast", function() {
 	const r = new SpacedTextAccumulator(f);
 	r.push(App.UI.DOM.makeElement("span", "Shamefast", ["bold"]), "is a sexual", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
 	r.push(App.Encyclopedia.link("tease"), App.Encyclopedia.link("quirk", "Quirks"), "by training,");
-	r.push("a good", App.Encyclopedia.link("Attendant"), ", a powerful sex drive, or the", App.Encyclopedia.link("submissive", "Humiliation Submissive"), "fetish.");
+	r.push("a good", App.UI.DOM.combineNodes(App.Encyclopedia.link("Attendant"), ","), "a powerful sex drive, or the", App.Encyclopedia.link("humiliation", "Humiliation Fetishists"), "fetish.");
 	r.toParagraph();
 
 	return f;
diff --git a/src/gui/Encyclopedia/encyclopediaSlaveLeaders.js b/src/gui/Encyclopedia/encyclopediaSlaveLeaders.js
index ae9f21f549be70d1a535044b054289c4b6887cf2..9638e5ac7058899612a3796e8a82e6619d22a5d2 100644
--- a/src/gui/Encyclopedia/encyclopediaSlaveLeaders.js
+++ b/src/gui/Encyclopedia/encyclopediaSlaveLeaders.js
@@ -71,11 +71,11 @@ App.Encyclopedia.addArticle("Attendant", function() {
 	const t = new DocumentFragment();
 	const r = [];
 	const link = (text, article, className) => App.Encyclopedia.link(text, article, className);
-	const goodAttendant = [link("submissiveness", "Submissives"), "have a calm libido", "appear older than 35", "a motherly air", App.UI.DOM.makeElement("span", "intelligent", ["cyan"]), "naturally female."];
+	const goodAttendant = [App.UI.DOM.makeElement("span", "intelligent", ["cyan"]), "naturally female", "appear older than 35", "have a calm libido and a motherly air."];
 
 	r.push("An", App.UI.DOM.makeElement("span", "Attendant", ["bold"]), "can be selected once the", link("Spa"), "facility has been built.");
 	r.push("Attendants provide emotional help to slaves in the spa, and can also soften flaws and even fix mindbroken slaves.");
-	r.push("Good Attendants are free of:", link("fetishes"), "or", App.UI.DOM.toSentence(goodAttendant));
+	r.push("Good Attendants are", link("submissive", "Submissives"), "or free of", App.UI.DOM.combineNodes(link("fetishes"), ","), App.UI.DOM.toSentence(goodAttendant));
 	App.Events.addNode(t, r, "div");
 
 	return t;
diff --git a/src/gui/Encyclopedia/encyclopediaSlaveQuirks.js b/src/gui/Encyclopedia/encyclopediaSlaveQuirks.js
index b451495035dfeb8a13a5f2e0a0a7f97976c0a05a..5fe510391a963baacd9fd24735d1d6c412b7c927 100644
--- a/src/gui/Encyclopedia/encyclopediaSlaveQuirks.js
+++ b/src/gui/Encyclopedia/encyclopediaSlaveQuirks.js
@@ -3,11 +3,12 @@ App.Encyclopedia.addArticle("Quirks", function() {
 	const r = new SpacedTextAccumulator(f);
 	r.push(App.UI.DOM.makeElement("span", "Quirks", ["bold"]));
 	r.push("are positive slave qualities. They increase slaves' value and performance at sexual assignments, and each quirk also has other, differing effects. Each quirk is associated with a corresponding");
-	r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), ", and slave can have two quirks (a sexual quirk and a behavioral quirk), just like flaws. Quirks may appear randomly, but the most reliable way to give slaves quirks is to soften flaws."));
+	r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), ", and each slave can have two quirks (a sexual quirk and a behavioral quirk), just like flaws. Quirks may appear randomly, but the most reliable way to give slaves quirks is to soften flaws."));
 	r.toParagraph();
 
-	r.push("The", App.Encyclopedia.link("Head Girl"));
-	r.push("can be ordered to soften flaws, and the player character can soften flaws with personal attention. Flaws can also be naturally softened into quirks by fetishes.");
+	r.push("The", App.Encyclopedia.link("Head Girl"), "can be ordered to soften flaws, the");
+	r.push(App.Encyclopedia.link("Attendant"), "can soften the flaws of slaves resting in the", App.UI.DOM.combineNodes(App.Encyclopedia.link("Spa"), ","))
+	r.push("and the player character can soften flaws with personal attention. Certain flaws can also be naturally softened into quirks by fetishes, high libido, or other factors.");
 	r.toNode("div");
 
 	return f;
@@ -18,7 +19,7 @@ App.Encyclopedia.addArticle("Adores men", function() {
 	const r = new SpacedTextAccumulator(f);
 	r.push(App.UI.DOM.makeElement("span", "Adores men", ["bold"]), "is a behavioral", App.Encyclopedia.link("quirk", "Quirks"), "developed from the");
 	r.push(App.Encyclopedia.link("hates women"), App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), "."));
-	r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.Encyclopedia.link("pregnancy fetishists", "Pregnancy Fetishists"), "."));
+	r.push("Slaves may naturally become", App.Encyclopedia.link("pregnancy fetishists", "Pregnancy Fetishists"), "if capable of becoming pregnant, or", App.Encyclopedia.link("cumsluts"), "otherwise.");
 	r.push("In addition to the standard value and sexual assignment advantages, they get bonus");
 	r.push(App.Encyclopedia.link("trust", "Trust", "mediumaquamarine"), "on", App.Encyclopedia.link("fucktoy"), "duty if the player character is masculine, and increased chance of gaining additional XY attraction.");
 	r.toNode("div");
@@ -31,7 +32,7 @@ App.Encyclopedia.addArticle("Adores women", function() {
 	const r = new SpacedTextAccumulator(f);
 	r.push(App.UI.DOM.makeElement("span", "Adores women", ["bold"]), "is a behavioral", App.Encyclopedia.link("quirk", "Quirks"), "developed from the");
 	r.push(App.Encyclopedia.link("hates men"), App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), "."));
-	r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.Encyclopedia.link("breast fetishists", "Boob Fetishists", ".")));
+	r.push("Slaves may naturally become", App.Encyclopedia.link("pregnancy fetishists", "Pregnancy Fetishists"), "if capable of impregnating others, or", App.Encyclopedia.link("breast fetishists", "Boob Fetishists"), "otherwise.");
 	r.push("In addition to the standard value and sexual assignment advantages, they get bonus");
 	r.push(App.Encyclopedia.link("trust", "Trust", "mediumaquamarine"), "on", App.Encyclopedia.link("fucktoy"), "duty if the player character is feminine, and increased chance of gaining additional XX attraction.");
 	r.toNode("div");
@@ -95,7 +96,7 @@ App.Encyclopedia.addArticle("Funny", function() {
 	const r = new SpacedTextAccumulator(f);
 	r.push(App.UI.DOM.makeElement("span", "Funny", ["bold"]), "is a behavioral", App.Encyclopedia.link("quirk", "Quirks"), "developed from the");
 	r.push(App.Encyclopedia.link("odd"), App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), "."));
-	r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.Encyclopedia.link("Masochists"), "."));
+	r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.Encyclopedia.link("masochists"), "."));
 	r.push("In addition to the standard value and sexual assignment advantages, they get bonus");
 	r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "while performing", App.UI.DOM.combineNodes(App.Encyclopedia.link("public service", "Public Service"), "."));
 	r.toNode("div");
@@ -145,7 +146,7 @@ App.Encyclopedia.addArticle("Gagfuck Queen", function() {
 	const f = new DocumentFragment();
 	const r = new SpacedTextAccumulator(f);
 	r.push(App.UI.DOM.makeElement("span", "Gagfuck Queen", ["bold"]), "is a sexual", App.Encyclopedia.link("quirk", "Quirks"), "developed from the");
-	r.push(App.Encyclopedia.link("Hates oral"), App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), "."));
+	r.push(App.Encyclopedia.link("hates oral"), App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), "."));
 	r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.Encyclopedia.link("cumsluts"), "."));
 	r.push("In addition to the standard value and sexual assignment advantages, they enjoy living in a penthouse upgraded with phallic food dispensers.");
 	r.toNode("div");
@@ -157,8 +158,8 @@ App.Encyclopedia.addArticle("Painal Queen", function() {
 	const f = new DocumentFragment();
 	const r = new SpacedTextAccumulator(f);
 	r.push(App.UI.DOM.makeElement("span", "Painal Queen", ["bold"]), "is a sexual", App.Encyclopedia.link("quirk", "Quirks"), "developed from the");
-	r.push(App.Encyclopedia.link("Hates anal"), App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), "."));
-	r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.Encyclopedia.link("humiliation fetishists", "Humiliation Fetishists"), "."));
+	r.push(App.Encyclopedia.link("hates anal"), App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), "."));
+	r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.Encyclopedia.link("buttsluts"), "."));
 	r.push("In addition to the standard value and sexual assignment advantages, they enjoy living in a penthouse upgraded with dildo drug dispensers.");
 	r.toNode("div");
 
@@ -170,7 +171,7 @@ App.Encyclopedia.addArticle("Perverted", function() {
 	const r = new SpacedTextAccumulator(f);
 	r.push(App.UI.DOM.makeElement("span", "Perverted", ["bold"]), "is a sexual", App.Encyclopedia.link("quirk", "Quirks"), "developed from the");
 	r.push(App.Encyclopedia.link("repressed"), App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), "."));
-	r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.UI.DOM.combineNodes(App.Encyclopedia.link("submissives"), ".")));
+	r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.UI.DOM.combineNodes(App.Encyclopedia.link("humiliation fetishists", "Humiliation Fetishists"), ".")));
 	r.push("In addition to the standard value and sexual assignment advantages, they get bonus");
 	r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "when in incestuous relationships, and gain additional sex drive each week.");
 	r.toNode("div");
@@ -209,7 +210,7 @@ App.Encyclopedia.addArticle("Strugglefuck Queen", function() {
 	const r = new SpacedTextAccumulator(f);
 	r.push(App.UI.DOM.makeElement("span", "Strugglefuck Queen", ["bold"]), "is a sexual", App.Encyclopedia.link("quirk", "Quirks"), "developed from the");
 	r.push(App.Encyclopedia.link("hates penetration"), App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), "."));
-	r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.Encyclopedia.link("Masochists"), "."));
+	r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.Encyclopedia.link("masochists"), "."));
 	r.push("In addition to the standard value and sexual assignment advantages, this Quirk avoids");
 	r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "losses if the slave is assigned to be a");
 	r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("sexual servant", "Sexual Servitude"), "."));
@@ -237,7 +238,7 @@ App.Encyclopedia.addArticle("Unflinching", function() {
 	const r = new SpacedTextAccumulator(f);
 	r.push(App.UI.DOM.makeElement("span", "Unflinching", ["bold"]), "is a sexual", App.Encyclopedia.link("quirk", "Quirks"), "developed from the");
 	r.push(App.Encyclopedia.link("crude"), App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), "."));
-	r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.Encyclopedia.link("Masochists"), "."));
+	r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.Encyclopedia.link("masochists"), "."));
 	r.push("In addition to the standard value and sexual assignment advantages, they will experience a partial rebound during weeks in which they lose");
 	r.push(App.Encyclopedia.link("devotion.", "From Rebellious to Devoted", "hotpink"));
 	r.toNode("div");