diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 9e9985f01366c9dcb11cbcabe57e3b2ad0e24298..edb37e2defe9c411170b211829a06713f66d9ab4 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,12 @@
 
 0.10.7.1-0.10.x
 
+10/19/2018
+
+	24
+	-fixes
+	-more vectors from deepmurk
+
 10/18/2018
 
 	23
@@ -7443,7 +7449,7 @@ Experimental build
 	-Fixed a bug where a vaginaless slave would wear a fake belly leaving you with no way to remove it.
 	
 	
-Security Expansion	(Officaly intergated into Pregmod since 0.10.7.1 v153)
+Security Expansion	(Officaly intergated into Pregmod since 0.10.7.1 v153, 11/25/17 )
 
 PregmodBase v139 
 11/20/17
diff --git a/devNotes/clothing hair and accessory passages.txt b/devNotes/clothing hair and accessory passages.txt
index 704e4230ed142e40082f1cecf6de5815ea13dd5f..769ea074b78bdee16eb39f2bbaf3aa452f0bd750 100644
--- a/devNotes/clothing hair and accessory passages.txt	
+++ b/devNotes/clothing hair and accessory passages.txt	
@@ -47,6 +47,7 @@ Clothes:
 
 	Possible:
 		artWidgets.tw
+		saClothes.tw
 		saChoosesOwnClothes.tw
 		eventSelectionJS.tw
 		saLiveWithHG.tw
@@ -66,6 +67,7 @@ Shoes:
 	
 	Possible:
 		saLongTermEffects.tw
+		saClothes.tw
 		saChoosesOwnClothes.tw
 		eventSelectionJS.tw
 		RESS.tw
@@ -94,6 +96,7 @@ Collars:
 
 	Possible:
 		saLongTermEffects.tw
+		saClothes.tw
 		saDevotion.tw
 		raWidgets.tw
 		artWidgets.tw
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 572c0646598a0d28fb3862f159e7642293f8eed2..8015d2efcfd9edc6a6d64417e83dd1e354ad6a29 100644
--- a/devNotes/twine JS.txt	
+++ b/devNotes/twine JS.txt	
@@ -13896,11 +13896,6 @@ window.DefaultRules = (function() {
 					flag = false;
 				break;
 			
-			case "hyper butt injections":
-				if (!(slave.butt < 20))
-					flag = false;
-				break;
-			
 			case "nipple atrophiers":
 				if (!(["huge", "puffy", "cute"].includes(slave.nipples)))
 					flag = false;
@@ -20949,9 +20944,6 @@ window.SlaveSummaryUncached = (function(){
 			case "dark olive":
 				r += `D. Oli`;
 				break;
-			case "pure white":
-				r += `P. Whi`;
-				break;
 			case "lightened":
 				r += `Ltnd`;
 				break;
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index b3d915451221777e585b16d8c9c031e9b02b3c7d..f4068c7fb5e06e3062d59b1c880a901ebf206a7f 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -379,12 +379,12 @@ Should you be able to surgically attach a penis to your female slaves and starti
 <</if>>
 
 <br>
-<<if ($dangerousPregancy == 0)>>
+<<if ($dangerousPregnancy == 0)>>
 	Advanced pregnancy complications such as miscarriage and premature birth are currently ''disabled''.
-	[[Enable|Intro Summary][$dangerousPregancy = 1]]
+	[[Enable|Intro Summary][$dangerousPregnancy = 1]]
 <<else>>
 	Advanced pregnancy complications such as miscarriage and premature birth are currently ''enabled''.
-	[[Disable|Intro Summary][$dangerousPregancy = 0]]
+	[[Disable|Intro Summary][$dangerousPregnancy = 0]]
 <</if>>
 
 <br>
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 04806e209848b135ca2972e4d5cc2699419a5472..52a589a1a651644c96c9083b02fb333520eaa93f 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -2596,7 +2596,7 @@ LORE: INTERVIEWS
 	<br>''Faraen'' for a full vector art variant.
 	<br>''anon'' for more hair vectors for the external art.
 	<br>''Vas'' for massive JS work and completely redoing the RA.
-	<br>''deepmurk'' for a massive expansion in conjunction with Nox to the original embedded vector art. Also more hairs, shoes, clothes, and descriptions. Overhauled skin colors too.
+	<br>''deepmurk'' for a massive expansion in conjunction with Nox to the original embedded vector art. Also more hairs, clothes, shoes, clothes, descriptions and clothes. Overhauled skin colors too.
 	<br>''Channel8'' for FCTV content (and likely giving the spellCheck an aneurysm).
 	<br>''Channel13'' for FCTV content.
 	<br>''kidkinster'' for slave management ui stuff and induced NCS.
@@ -2605,7 +2605,8 @@ LORE: INTERVIEWS
 	<br>''Autistic Boi'' for Mediterranean market preset.
 	<br>''anon'' for the PA subjugationsist and supremacist FS appearances.
 	<br>''Editoranon and Milkanon?'' for prison markets and the nursing handjob scene.
-	<br>''DCoded'' for bestiality content, scenes, facilities and fixes.
+	<br>''DCoded'' for bestiality content, scenes, facilities and fixes. Also the future nursery and a pussy licking scene.
+	<br>''HiveBro'' for giving hyperpregnant slaves some serious loving.
 	<br>''git contributors lost to time'' for their submissions and work through pregmod's git.
 	<br>''Bane70'' optimized huge swaths of code with notable professionalism.
 	<br>''Circle Tritagonist'' provided several new collars and outfits.
@@ -2616,7 +2617,7 @@ LORE: INTERVIEWS
 	<br>''Dej'' coded better diet logic for the RA.
 	<br>''Flooby Badoop'' wrote and coded a random recruitment event.
 	<br>''FC_BourbonDrinker'' went into the code to locate and fix bugs.
-	<br>''Shokushu'' created a rendered imagepack comprising 775 images, and assisted with the code necessary to display them.
+	<br>''Shokushu'' created a rendered imagepack comprising 775 images, and assisted with the code necessary to display them. Also maybe the dinner party event?
 	<br>''NovX'' created a vector art system.
 	<br>''Mauve'' contributed vector collars and pubic hair.
 	<br>''Rodziel'' contributed the cybernetics mod.
@@ -2624,7 +2625,7 @@ LORE: INTERVIEWS
 	<br>''freecitiesbandit'' wrote a number of recruitment, future society, mercenary and random events, provided tailed buttplugs, new eyes and tattoos, and contributed the code for the mercenary raiders policy.
 	<br>''DrNoOne'' wrote the bulk slave purchase and persistent summary code.
 	<br>''Mauve'' provided vector art for chastity belts and limp dicks.
-	<br>''Klorpa'' for dozens of new nationalities and boundless new names and nicknames. Also monokinis, middle eastern clothing and aprons. Also the hearing overhaul
+	<br>''Klorpa'' for dozens of new nationalities and boundless new names and nicknames. Also monokinis, middle eastern clothing and aprons. Also the hearing overhaul.
 	<br>''amomynous0'' for bug reports and testing in addition to SFmod unit descriptions.
 	<br>''wepsrd'' for QOL (hormonal balance cheat and lactation adaptation to new menu) fixes.
 
diff --git a/src/js/DefaultRules.tw b/src/js/DefaultRules.tw
index 8bbbffe31404e267e5592e9af468c40b1e8eac6e..7148316c64707efcf6fcbc14618f68cd80cc6202 100644
--- a/src/js/DefaultRules.tw
+++ b/src/js/DefaultRules.tw
@@ -1234,11 +1234,6 @@ window.DefaultRules = (function() {
 					flag = false;
 				break;
 			
-			case "hyper butt injections":
-				if (!(slave.butt < 20))
-					flag = false;
-				break;
-			
 			case "nipple atrophiers":
 				if (!(["huge", "puffy", "cute"].includes(slave.nipples)))
 					flag = false;
diff --git a/src/js/slaveSummaryWidgets.tw b/src/js/slaveSummaryWidgets.tw
index 1ce781992966e23c4abcd801eef3909d02d11d68..d0873a06df005cd066924e5e1e0d856110b56876 100644
--- a/src/js/slaveSummaryWidgets.tw
+++ b/src/js/slaveSummaryWidgets.tw
@@ -1757,9 +1757,6 @@ window.SlaveSummaryUncached = (function(){
 			case "dark olive":
 				r += `D. Oli`;
 				break;
-			case "pure white":
-				r += `P. Whi`;
-				break;
 			case "lightened":
 				r += `Ltnd`;
 				break;
diff --git a/src/pregmod/fLickPussy.tw b/src/pregmod/fLickPussy.tw
index bee46b35bf538c8cf4aa45a8e8671cc3eb577414..a29259c202ab7a54b5311cef7ba4c74ce78edb60 100644
--- a/src/pregmod/fLickPussy.tw
+++ b/src/pregmod/fLickPussy.tw
@@ -20,6 +20,6 @@
     You have $activeSlave.slaveName brought into your office and placed on your couch.
 <</if>>
 
-After $he is situated, you go over to $him<<if $activeSlave.clothes != "no clothing">> and take off $his clothing, causing $him to <<if _devotion > 50>>give you a soft smile<<else>>give you an angry glare<</if>><</if>>. You suddenly grab $his hips and pull $his crotch to your face, causing $him to give a shriek of surprise. Looking at $him directly in the eyes, you begin to run your tongue along $his labia, drawing a soft moan from $him. The combination of the pleasure and the intense look from the <<if $PC.title == 0>>wo<</if>>man $he<<if _devotion > 95>> loves <<elseif _devotion > 50>>'s accepted as $his <<= WrittenMaster($activeSlave)>><<else>>hates/*not sure what to use for "reluctant"*/<</if>> makes $him blush, but you don't let up. You give $his clit a few expiremental tweaks, causing $his moans to intensify<<if canWalk($activeSlave)>> and $his legs to tighten around your head<</if>>. Before $he cums, though, you pull back, causing $him to whine in frustration. You begin again, then pull back again just before $he orgasms. You repeat this several more times, each time causing $him to become more and more frustrated. Finally, one last stroke of your tongue causes $him to go over the edge, making $him scream out <<if _devotion > 50>>your name<</if>> in ecstasy. You send $him back to $his assignment before calling in another slave to clean up the mess.
+After $he is situated, you go over to $him<<if $activeSlave.clothes != "no clothing">> and take off $his clothing, causing $him to <<if _devotion > 50>>give you a soft smile<<else>>give you an angry glare<</if>><</if>>. You suddenly grab $his hips and pull $his crotch to your face, causing $him to give a shriek of surprise. Looking at $him directly in the eyes, you begin to run your tongue along $his labia, drawing a soft moan from $him. The combination of the pleasure and the intense look from the <<if $PC.title == 0>>wo<</if>>man $he<<if _devotion > 95>> loves <<elseif _devotion > 50>>'s accepted as $his <<= WrittenMaster($activeSlave)>><<else>> hates/*not sure what to use for "reluctant"*/<</if>> makes $him blush, but you don't let up. You give $his clit a few expiremental tweaks, causing $his moans to intensify<<if canWalk($activeSlave)>> and $his legs to tighten around your head<</if>>. Before $he cums, though, you pull back, causing $him to whine in frustration. You begin again, then pull back again just before $he orgasms. You repeat this several more times, each time causing $him to become more and more frustrated. Finally, one last stroke of your tongue causes $him to go over the edge, making $him scream out <<if _devotion > 50>>your name<</if>> in ecstasy. You send $him back to $his assignment before calling in another slave to clean up the mess.
 
 <<set $activeSlave.vaginalCount++, $vaginalTotal++>>
\ No newline at end of file
diff --git a/src/pregmod/reLegendaryWomb.tw b/src/pregmod/reLegendaryWomb.tw
index 806c34d6a6c6a9b0ec2a1360c2906519132be838..7a83ea3469c2e852c1ef455aa5ae6043e03b7c37 100644
--- a/src/pregmod/reLegendaryWomb.tw
+++ b/src/pregmod/reLegendaryWomb.tw
@@ -20,9 +20,7 @@ This is a rare opportunity. The idea of pregnancy pageant isn't new but it is un
 
 <span id="result">
 <<link "Fairly enter her in the pregnancy pageant">>
-	<<replace "#name">>
-	$activeSlave.slaveName
-	<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<if random(1,100) > 90>>
 		<<replace "#result">>
 		$activeSlave.slaveName is shown in public, closely inspected by the judging committee, and then asked to demonstrate how to pleasure a man while so heavily pregnant. It's likely there was some bribery behind the scenes, but her heavy belly and creative positions win the day. Against all odds she is named best in show, and will be @@.green;remembered@@ as a breeder of the highest pedigree. As her owner, your reputation has @@.green;also increased.@@
@@ -40,9 +38,7 @@ This is a rare opportunity. The idea of pregnancy pageant isn't new but it is un
 	<</if>>
 <</link>>
 <br><<link "Spend <<print cashFormat(5000)>> bribing the judges">>
-	<<replace "#name">>
-	$activeSlave.slaveName
-	<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<if random(1,100) > 50>>
 		<<replace "#result">>
 		$activeSlave.slaveName is shown in public, closely inspected by the judging committee, and then asked to demonstrate how to pleasure a man while so heavily pregnant. Several of the judges cannot resist giving you a wink as they look her over. $activeSlave.slaveName is unsurprisingly named best in show, and will be @@.green;remembered@@ as a breeder of the highest pedigree. As her owner, your reputation has @@.green;also increased.@@
@@ -62,9 +58,7 @@ This is a rare opportunity. The idea of pregnancy pageant isn't new but it is un
 	<</if>>
 <</link>>
 <br><<link "Spend <<print cashFormat(10000)>> bribing the judges and sabotaging the competition">>
-	<<replace "#name">>
-	$activeSlave.slaveName
-	<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<if random(1,100) > 10>>
 		<<replace "#result">>
 		$activeSlave.slaveName is shown in public, closely inspected by the judging committee, and then asked to demonstrate how to pleasure a man while so heavily pregnant. After she's put through her paces, the most unfortunate series of accidents somehow befalls her fellow mothers. One is taken ill, another seems drugged, and another went into labor and gave birth, disqualifying her. $activeSlave.slaveName is unsurprisingly named best in show, and will be @@.green;remembered@@ as a breeder of the highest pedigree. As her owner, your reputation has @@.green;also increased.@@
diff --git a/src/pregmod/theBlackMarket.tw b/src/pregmod/theBlackMarket.tw
index 3c3ec7610672a3f5e88c062517b950664ca72fdc..d7f6ebc96b3cebf06fb382a06c3733405ebde897 100644
--- a/src/pregmod/theBlackMarket.tw
+++ b/src/pregmod/theBlackMarket.tw
@@ -142,7 +142,6 @@ Of all the wonders present, the thing that catches your eye the most is a shady
 			<<if $thisWeeksIllegalFSWares[_bim] == "childhoodFertilityInducedNCS">>
 				<<if $minimumSlaveAge <= 15>>
 					<dt>@@.cyan;Childhood Fertility Induced NCS (Induced Neotenic Complex Syndrome or Syndrome X modified for fertility).@@</dt> 
-					<dd>
 					<<if $minimumSlaveAge > 8>>
 						Illegal information for the Childhood Fertility @@.orange;Induced NCS@@ (genetic engineering and hormonal blend) research recipe.<br>
 						"I'm sorry, I can't sell this product to you, even if I wanted to," he says. "I have this technology, which if applied, would make slaves appear younger than the legal age of majority. I picked it up from an exotics dealer, who picked it up from some old world government research center. And yes, I know, this is a black market, and I would be happy to sell it to you, except, you see, too many of the wrong people know I have it, and while the knowledge isn't illegal, selling or using it is. See if I sell this to you, you'd start getting younger looking slaves, and those people would try to take us both down, and since I'm not the master of an arcology, I would probably end up enslaved, and I'm not interested in that. If only the laws were more open about who could have sex with who, I could sell this to anyone interested."
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index 7c431edb9473dd5a646e4d6b18147c604a88af15..673780749af1ec53d3163cf5eed1148ea611020e 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -157,7 +157,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 	//Your bodyguard lacks the musculature required to manhandle him.//
 <<else>>
 <<link "$He uses $his muscles to manhandle him">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	$activeSlave.slaveName stomps over to the drunken delinquent, who finds himself sobering up with each step the muscular woman makes in his direction. Soon he finds himself <<if ($activeSlave.height > 170)>>staring up at her $activeSlave.faceShape face<<elseif ($activeSlave.height > 150)>>eye to eye with her $activeSlave.faceShape face<<else>>looking down at her $activeSlave.faceShape face<</if>> as $he grips him by the shoulders and lifts him bodily off of the ground. The man squeals with terror as he begs forgiveness for his affront to you, but $activeSlave.slaveName simply tosses him away from your presence as if discharging him from a bar. Word of your herculean protector is soon @@.green;the talk of $arcologies[0].name and beyond@@, with many in the Old World mistakenly believing you are guarded by a warrior so strong $he can throw any man the breadth of a room in a single heave.
 	<<set $rep += 500>>
@@ -168,7 +168,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 	<br>//Your bodyguard lacks the height required to tower over and intimidate him.//
 <<else>>
 <br><<link "$He intimidates him with $his towering height">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	$activeSlave.slaveName calmly strides over to the drunken delinquent and simply towers over him with a glower on her $activeSlave.faceShape face. The man quickly finds himself sobering up and moves to run from the scene with all the drunken haste he can muster. Unfortunately for him, $activeSlave.slaveName matches his pace with a brisk power-walk, and the citizen soon finds himself face down on the pavement after a swift strike to the back of the head. Word of your giant protector is soon @@.green;the talk of $arcologies[0].name and beyond@@, with many in the Old World mistakenly believing you are guarded by a warrior twice the height of any man.
 	<<set $rep += 500>>
@@ -179,7 +179,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 	<br>//Your bodyguard lacks the beauty required to distract him with her wiles.//
 <<else>> 
 <br><<link "$He distracts him with her beautiful face">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	$activeSlave.slaveName seductively saunters over to the drunken delinquent and poses alluringly nearby. The man can't help but become entranced by her gorgeous $activeSlave.faceShape face, and follows her like a lost puppy as $he beckons with one outstretched finger. $activeSlave.slaveName lures her prey into a nearby alley before slamming her fist into the unsuspecting drunkard's face, leaving him knocked out cold on the floor before returning to guard you. Word of your beautiful protector is soon @@.green;the talk of $arcologies[0].name and beyond@@, with many in the Old World mistakenly believing you are guarded by a warrior unmatched by any woman in the world in her good looks.
 	<<set $rep += 500>>
@@ -190,7 +190,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 	<br>//Your bodyguard lacks the intellect required to de-escalate the situation with tact.//
 <<else>> 
 <br><<link "$He de-escalates the situation with tact">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	$activeSlave.slaveName walks over to the man, puts an arm about his shoulders and explains to him <<if canTalk($activeSlave)>>in hushed whispers<<else>>with rapid sign language<</if>> the severity of the situation. The man sobers up quickly as the reality of his actions set in and he soon beats a hasty exit from the scene as $activeSlave.slaveName returns to guard your body. Word of your tactful protector is soon @@.green;the talk of $arcologies[0].name and beyond@@, with many in the Old World mistakenly believing you are guarded by a warrior whose silver tongue is the envy of many politicians.
 	<<set $rep += 500>>
@@ -201,7 +201,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 	<br>//Your bodyguard lacks the combat skill required to fight him hand to hand.//
 <<else>> 
 <br><<link "$He fights him hand to hand">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	$activeSlave.slaveName quickly maneuvers over to the man and strikes him low in the stomach, robbing him of breath in a single strike. The man sobers up somewhat and raises his arms to defend himself, but finds himself outmatched by $activeSlave.slaveName's skillful attacks. It doesn't take long for $activeSlave.slaveName to reduce the man to a battered heap on the ground with her hands alone, after which $he soon returns to you to guard your body. Word of your martial protector is soon @@.green;the talk of $arcologies[0].name and beyond@@, with many in the Old World mistakenly believing you are guarded by a warrior whose hands are deadlier than many weapons.
 	<<set $rep += 500>>
@@ -209,7 +209,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 <</link>>
 <</if>> 
 <br><<link "$He fires a few dozen warning shots">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	$activeSlave.slaveName draws her firearm and blasts the pavement between yourself and the delinquent with a hail of bullets. The man sobers up immediately at the excessive use of firepower and flees the scene in fear of $activeSlave.slaveName turning her weapon on him. $activeSlave.slaveName holsters her weapon and returns to your side to guard you. Word of your trigger happy protector is soon @@.green;the talk of $arcologies[0].name@@ and you find most citizens are keen to avoid causing you offense with $activeSlave.slaveName around.
 	<<set $rep += 100>>
@@ -219,7 +219,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 <<case "madam strategy">>
 
 <<link "Review $his charges' skills with $him">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You call $activeSlave.slaveName up to your office; $he enters with the clear anticipation of being thrown over your desk, but instead finds $himself sitting across it from you, taking part in a three-way strategy session between you and $assistantName. The three of you carefully review the sexual advantages and disadvantages of each of $his whores. $He is @@.hotpink;properly deferential,@@ but definitely has insight to offer about how many of them satisfy customers. With $his input, you put together a plan to @@.green;address@@ their deficiencies with instruction and hands-on correction.
 	<<set $activeSlave.devotion += 4>>
@@ -237,7 +237,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 	<</replace>>
 <</link>>
 <br><<link "Talk over the whores' appearance and correct any deficiencies">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You call $activeSlave.slaveName up to your office; $he enters with the clear anticipation of being thrown over your desk, but instead finds $himself sitting across it from you, taking part in a three-way inventory review with you and $assistantName. The three of you carefully review the appearance of each of her whores. $He is @@.hotpink;properly deferential,@@ but definitely has insight to offer about how many of them appeal to customers. With her input, you put together a plan to @@.limegreen;correct@@ their deficiencies when they can be pulled out of a shift for a quick surgical improvement.
 	<<set $activeSlave.devotion += 4>>
@@ -275,7 +275,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 <<case "DJ publicity">>
 
 <<link "Make $him the face of an ad campaign">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You bring $him out to a pretty balcony and put her through an extended photo shoot. $He has no idea what you're planning, but $he's skilled enough not to need to. $He dons different outfits, changes makeup, and even shifts personas for the camera, producing hundreds of elegant, sensual and eye-catching images. You dismiss her back to the club when you're done, and $he clearly thinks little of it. The next day, however, you walk her out onto the club in the morning. When the two of you, <<= WrittenMaster()>> and DJ, reach the main club, $he stops short when $he catches sight of the main billboard screen. There $he is, resplendent and opulent, ten meters tall, giving the viewer a sultry look. $He only breaks down for a single moment, but it's quite a moment: $he cries rather inelegantly, <<if canTalk($activeSlave)>><<say sobb>>ing "I love you <<Master>>" into your ear<</if>> before giving you a @@.hotpink;wet kiss.@@ Then $he runs over to stand under the screen, looking back at you to give you a @@.green;picture-perfect@@ imitation of the billboard $he's standing under before laughing at $himself a little.
 	<<set $cash -= 1000>>
@@ -284,7 +284,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 	<</replace>>
 <</link>> //This option will cost <<print cashFormat(1000)>>//
 <br><<link "Keep $him to yourself for a week">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	Exclusivity and slavery interact in ways more than merely complex. $activeSlave.slaveName's most passionate devotees are devastated to find her nowhere but by your side for the whole week. Their reaction is mixed: awe, envy, resentment; but mostly @@.green;renewed respect@@ that $he is your creature, and yours alone. A lesser slave might show off the particularity you show her, bringing shame on you by giving the impression that you care for her as more than a slave. $He is no lesser slave, though, and thoroughly understands the fine line the two of you must walk as <<= WrittenMaster()>> and slave. $He makes @@.hotpink;painstakingly@@ clear, through every public glance and gesture, that $he is yours as a matter of @@.mediumaquamarine;trust@@ rather than as a matter of love.
 	<<set $activeSlave.devotion += 4>>
@@ -294,7 +294,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 <</link>>
 <<if $activeSlave.prestige == 0>>
 <br><<link "Put public emphasis on $him with the objective of making $him famous">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	For the coming week, $he does the publicity rounds. It's a little different than a free celebrity might do, but the mere act of letting her be interviewed is enough of a display of your confidence in her loyalty that people @@.green;take notice.@@ $He will be @@.green;forever remembered@@ as one of the first slaves to go before the press and articulately explain why $he loves being your property. $He looks good doing it, too.
 	<<set $cash -= 10000>>
@@ -307,7 +307,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 <<case "tired collectrix">>
 
 <<link "Use $his ass as $he looks after $himself">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	Wordlessly, you<<if ($PC.dick == 0)>> don a strap-on and<</if>> come up behind her; the first thing to touch her is <<if ($PC.dick == 0)>>the phallus<<else>>your rapidly hardening dick<</if>>, which pokes against <<if $activeSlave.height >= 170>>right up against her asshole, since $he's nice and tall enough for standing anal. $He gasps a little and angles her hips to accept your cock.<<else>>her lower back, since $he's shorter than you. $He gasps a little and hikes $himself up on tiptoe to accept your cock.<</if>> As $he feels you slide into her body $he whimpers with devotion, turning her upper body so $he can kiss her <<= WrittenMaster()>> while he sodomizes her. <<if !canTalk($activeSlave)>>$He uses gestures to thank you for making her feel like the milkers do.<<else>>"<<S>>o thi<<s>> i<<s>> how it feel<<s>> when I do them," $he whispers.<</if>> $He uses the lotion to masturbate while $he takes it, wincing whenever $he loses control and squeezes $his sore cock too hard. When you're done $he sinks to the bathroom floor in a boneless pool of @@.hotpink;satisfied sexual exhaustion,@@ dripping ejaculate from her front<<if ($PC.dick == 0)>><<else>> and back<</if>>.
 	<<set $activeSlave.devotion += 4>>
@@ -316,7 +316,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 	<</replace>>
 <</link>>
 <br><<link "Help $him with $his duties">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	$activeSlave.slaveName is surprised to find you in the collection facility when $he gets there the next morning. Since you're already <<if ($PC.dick == 0)>>using a strap-on to fuck<<else>>balls deep in<</if>> a whining milker's ass, $he understands immediately that you're there to help. $He's @@.hotpink;gratified,@@ and does her best to make sure you have a good time. With so many slaves physically restrained to make their backdoors available, it's hard not to. $activeSlave.slaveName does her best to use a slave next to you so $he can be available for extra amusement at all times as the two of you sodomize away.
 	<<set $activeSlave.devotion += 4>>
@@ -326,14 +326,14 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 <<case "tired milkmaid">>
 
 <<link "Give $him a businesslike massage">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	When $he <<if canHear($activeSlave)>>hears you enter $dairyName,<<else>>realizes you've entered $dairyName,<</if>> $he turns to you for instructions, but you wordlessly dismiss her back to her stretching. $He gets back to it, but is surprised to find her shoulders seized by your powerful hands. $He shivers helplessly as you knead her knotted muscles, whimpering with near-orgasmic delight as $he feels the day's aches ground away under your grip. When you're done with her, $he touches her toes and then smoothly rises to stretch with her hands over her head, groaning with sheer pleasure at the feeling. <<if !canTalk($activeSlave)>>$He thanks you profusely with gestures, and then hesitantly asks if you'd like to use her body.<<else>>"Thank you <<Master>>," $he <<say murmur>>s. "Would - would you like to u<<s>>e my body, now?"<</if>> You shake your head kindly and place a kiss on her forehead before continuing with your evening. As $he watches you go, $he suppresses @@.hotpink;another shiver.@@
 	<<set $activeSlave.devotion += 4>>
 	<</replace>>
 <</link>>
 <br><<link "Share a milk bath with $him">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	When $he <<if canHear($activeSlave)>>hears you enter $dairyName,<<else>>realizes you've entered $dairyName,<</if>> $he turns to you for instructions, but you wordlessly dismiss her back to her stretching. $He gets back to it, but is mystified as $he watches you out of the corner of her eye. The milk is held in a large tank before being filtered, pasteurized, and sold. You remove the lid from the tank and climb in. $He watches with incomprehension, but understanding dawns when you splash a little, demonstratively, and crook a finger at her. $He gives you a deliciously naughty look and hurries to join you in the warm milk, giggling when you pull her in with a slosh of creamy whiteness. $He doesn't break the surface after climbing in, kneeling under the milk to suck you off. $He has to surface periodically for breath, but the grin $he gives you each time makes up for it. $He manages to drag $his breasts <<if ($PC.boobs > 0)>>against yours<<else>>up your front<</if>> each time $he rises for air. When you climax, $he carefully swallows every drop to keep the filters from getting clogged. When $he surfaces for good, $he looks you in the eyes briefly before blushing and @@.mediumaquamarine;giving you a muscular hug.@@
 	<<set $activeSlave.trust += 4>>
@@ -345,14 +345,14 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 <<case "loving concubine">>
 
 <<link "It cannot wait">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	Your responsibilities will not wait. You keep at it, composing a firm yet even-handed message that @@.green;puts the miscreants in their place@@ without ruffling feathers. $activeSlave.slaveName has gone to sleep by the time you enter your suite, but $he wakes at your entrance and sleepily holds the sheets open so you can climb in. Once you're bedded down $he <<if ($activeSlave.boobs > 2000)>>lies close to you with one of $his breasts resting half on your chest, since $he can't fit under your arm with $his ridiculous tits.<<elseif ($activeSlave.boobs > 1000)>>burrows softly under your arm, $his breasts heavy against your chest.<<elseif ($activeSlave.boobs > 300)>>snuggles under your arm, $his breasts against your chest.<<else>>fits $himself under your arm, $his flat chest letting her mold $himself to your torso perfectly.<</if>>
 	<<set $rep += 100>>
 	<</replace>>
 <</link>>
 <br><<link "It can wait until after some lovemaking with the Concubine">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	When you enter your suite, the dim light reveals $activeSlave.slaveName waiting with $his beautiful body laid across the bed. When $he sees the kind of lovemaking you're in the mood for, $he spreads $his arms for you, smiling gently. $He kisses you lovingly, <<if !canTalk($activeSlave)>>taking your hand in $hers and drawing a heart on your palm with one finger.<<else>><<say murmur>>ing: "<<Master>>, I love you."<</if>> <<if ($PC.vagina == 1)>>$He lies on $his side and raises one leg for you so you can straddle the other, sliding up to press your pussy against $his submissive groin. You grind against her; the stimulation is so strong that $he writhes into the sheets, panting and whining.<<if $PC.dick == 1>> Your stiff dick, unused for once, slides deliciously between your warm bodies.<</if>><<else>><<if ($activeSlave.vagina > 0)>>$His pussy is warm and very wet, making penetration easy; $he gasps and arches $his back, clasping you between $his legs as $his $activeSlave.eyeColor eyes look deep into yours.<<elseif ($activeSlave.anus > 0)>>$His butt is relaxed and welcoming, and $he holds $his legs back to take missionary anal loving as $his $activeSlave.eyeColor look deep into yours.<<else>>$He holds $his thighs together for frottage so $he can love you without losing $his virginity.<</if>><</if>> You both know each other quite well, and maintain the gentle communion for a long time. When $he senses your climax building, $he lets $himself climb to orgasm with you, holding <<if ($PC.dick == 0)>>your hips in $his hands<<else>>you in $his arms<</if>>. $He quickly cleans you with $his mouth and heads to the shower. When $he gets out you're back at work, but $he comes out to @@.hotpink;plant another kiss on you.@@
 	<<set $activeSlave.devotion += 10>>
@@ -369,7 +369,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 <</link>>
 <<if ($activeSlave.anus > 0)>>
 <br><<link "It can wait until after some rough sex with the Concubine">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	When you enter your suite, the dim light reveals $activeSlave.slaveName waiting with $his beautiful body laid across the bed. When $he sees <<if ($PC.dick == 0)>>the big strap-on you're wearing<<else>>the kind of sex you're in the mood for<</if>>, $he turns over and pushes $his face down into the sheets. $He pulls $his knees under $himself and reaches back to pull $his <<if ($activeSlave.butt > 5)>>huge<<elseif ($activeSlave.butt > 2)>>sizeable<<else>>pretty<</if>> buttocks apart, relaxing and then clenching her <<if ($activeSlave.anus > 2)>>gaping<<elseif ($activeSlave.anus > 1)>>big<<else>>tight<</if>> asshole invitingly. $He starts <<if !canTalk($activeSlave)>>to point an inviting finger at her backdoor,<<else>>to <<say beg>> "Plea<<s>>e a<<ss>>rape me, M-" into the sheets,<</if>> but you interrupt her by shoving her forward so that $he's all the way face-down on the bed. $He knows how you like it and starts to wriggle, struggle, and whine as you roughly sodomize her, <<if ($PC.dick == 0)>>the strap-on<<else>>your cock<</if>> ramming straight up $his ass despite the uncomfortable angle, <<if ($activeSlave.butt > 5)>>which $his huge ass makes easier for her by limiting how deeply you can fuck her without $his buttocks spread wide.<<elseif ($activeSlave.butt > 2)>>which $his big behind makes easier for her by limiting how deeply you can fuck her.<<else>>which $his modest ass makes harder for her by allowing you to get really deep inside $his anus.<</if>> $He continues to wrestle with you, sometimes even managing to dislodge <<if ($PC.dick == 0)>>the strap-on<<else>>your dick<</if>>, allowing you the <<if ($PC.dick == 0)>>cruel delight<<else>>delicious sensation<</if>> of pushing it back up $his butt each time. Despite the pretense $his enjoyment is obvious;
 	<<if ($activeSlave.dick > 0) && ["chastity", "combined chastity"].includes($activeSlave.dickAccessory)>>
@@ -409,14 +409,14 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 <<case "bodyguard bedtime">>
 
 <<link "Let $him up in bed with you">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	Of course, $activeSlave.slaveName promptly obeys your order that she come up and join you in bed. After you have gone to sleep, however, she does not feel that she can sleep $himself, since she is no longer blocking the door. $He spends the rest of the night in sleepless watch, agonizing over this disruption of $his protection of your person. @@.mediumorchid;$He is confused and unhappy.@@
 	<<set $activeSlave.devotion -= 5>>
 	<</replace>>
 <</link>>
 <br><<link "Commend and reward her the next morning">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	The next morning, you sit at your desk to do business as usual, and $activeSlave.slaveName takes up station just behind your left shoulder. You thank her for $his vigilance as she does. $He looks almost confused to be thanked for doing $his proper duty, so you settle on a more direct method of communicating your closeness to her.
 	<<if ($activeSlave.vagina == 0) && !canDoVaginal($activeSlave)>>
@@ -461,7 +461,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 <<case "worried headgirl">>
 
 <<link "Trust her to tell them">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You tell her that you're sure she'll let them know, since she understands the situation and knows them all well. $His <<if $activeSlave.visualAge > 35>>mature<<elseif $activeSlave.face > 40>>lovely<<else>>attentive<</if>> face flicks <<if $activeSlave.height >= 185>>over<<else>>up<</if>> to look at you, @@.hotpink;her $activeSlave.eyeColor eyes glittering at the compliment.@@ "Thank you, <<Master>>," she murmurs. There's another flash on the horizon, followed by a series of smaller flashes and a low, slowly growing glow as secondaries go off and start a fire. $activeSlave.slaveName seems affected, a certain amount of moisture gathering in $his eyes, but she turns away to return to $his duties when it becomes clear that you intend to keep watching for a while, and aren't going to have sex with $him right this minute. $He does $his best to communicate the new reality to those of your slaves who are obedient enough to understand the truth: though they are slaves, @@.mediumaquamarine;there is safety to be found in slavery.@@
 	<<for $i = 0; $i < _SL; $i++>>
@@ -473,7 +473,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 	<</replace>>
 <</link>>
 <br><<link "$He's more important">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You shift to stand behind $him, your <<if $PC.boobs == 1>>breasts soft and sensual<<else>>chest hard and masculine<</if>> but not insistently sexual against her <<if $activeSlave.muscles > 30>>muscular<<elseif $activeSlave.weight > 10>>soft<<else>>warm<</if>> back. You wrap your arms around her, over her own, each of your <<if $PC.title == 1>>strong<<else>>feminine<</if>> hands finding and clasping one of $hers.<<if $activeSlave.boobs > 3000>> $His incredible boobs rest heavily over the top of both of your arms.<</if>> $He knows you very well, and shifts her torso ever so slightly from side to side, snuggling in a little closer to you to let you know she's comfortable and available without being demanding or needy. You speak quietly, your voice a reassuring <<if $PC.boobs == 0>>rumble<<else>>hum<</if>> she feels against her back<<if canHear($activeSlave)>> as well as hears<</if>>. You let her know that she has a place with you, and she always will. You let her know that you're worried too, and that you don't know what the future will bring. But you do know that she'll be by your side as you meet it. A silent shake in the pretty <<if $activeSlave.physicalAge > 30>>woman<<else>>girl<</if>> you've got in your arms is your only indication that @@.mediumaquamarine;she's crying a little@@ as she whispers, "Thank you, <<Master>>. I'll do my be<<s>>t."
 	<<set $activeSlave.trust += 5>>
@@ -521,7 +521,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 <<case "headgirl dickgirl">>
 
 <<link "Compliment your head girl's efforts, and encourage $him">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	As you walk into the room to offer $activeSlave.slaveName some positive reinforcement, $he groans, arches $his back, and shoots $his load down $slaves[$j].slaveName's retching <<if $seeRace == 1>>$slaves[$j].race <</if>>throat. $activeSlave.slaveName immediately greets you with perfect decorum, despite $his recent orgasm, and delivers $slaves[$j].slaveName an agonizing flick to the ear when _he2 does not, in $activeSlave.slaveName's opinion, follow suit with sufficient speed. You inform $activeSlave.slaveName that $he is a fine Head Girl, and that if $he continues to apply $himself $he will bring credit to you as a slave owner. $He looks a little surprised, but thanks you correctly. It is only due to the arcology's monitoring system that you know that, as you turn your back and go, a single tear escapes from $his eye and rolls down $his pretty <<if $seeRace == 1>>$activeSlave.race <</if>>cheek. In the coming week, no shirker is safe from $his wrath. @@.hotpink;Every single slave in your penthouse has become better broken to your will.@@
 	<<set $slaves[$j].oralCount += 1>>
@@ -534,7 +534,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 	<</replace>>
 <</link>>
 <br><<link "Instruct your head girl to give that slave special attention">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	The next time you see $activeSlave.slaveName, you ask what $slaves[$j].slaveName did. It seems _he2 did not complete _his2 assigned duty with sufficient speed, and compounded _his2 sin by talking back to $activeSlave.slaveName when $he pointed this out. You observe that if _he2 continues to fail to clean, _he2 can do it with _his2 tongue; and that if _he2 continues to fail to be polite, _he2 can clean $activeSlave.slaveName's <<if $seeRace == 1>>$activeSlave.race <</if>>body with _his2 tongue. Your head girl nods $his understanding with a grin. This is one week @@.hotpink;the disobedient bitch won't soon forget.@@
 	<<set $slaves[$j].devotion += 15>>
@@ -546,7 +546,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 <<case "worshipful impregnatrix">>
 
 <<link "Fuck $him">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You stand up, and from the look on your face, $he knows it's $his turn to get fucked. $He <<if $activeSlave.fetish == "dom">>visibly shelves $his dominance<<elseif $activeSlave.fetish == "sadist">>visibly lets $his sadism go<<else>>softens visibly<</if>>, looking relieved to be able to let someone else lead. You give her a lustful kiss on the lips and then reach down, taking hold of $his thigh and spinning her around, raising $his leg so $his foot's on the arm of the couch. <<if $PC.dick == 1>>You slide your dick<<else>>$He reaches under $himself and back to stroke your pussy as you press your hips against her, and you slide your fingers<</if>> inside $his <<if canDoVaginal($activeSlave)>>pussy<<else>>ass<</if>>. $He groans with discomfort as $his overtaxed dick tries and fails to become hard again, but relaxes as <<if $PC.dick == 1>>cockhead<<else>>fingertips<</if>> stimulate the most sensitive place inside her, producing arousal that obscures the soreness. You hold her close, <<if $PC.dick == 1>>one<<else>>your free<</if>> arm <<if $activeSlave.boobs > 4000>>cradling one of $his udders<<elseif $activeSlave.boobs > 1000>>hefting one of $his heavy breasts<<elseif $activeSlave.boobs > 400>>holding one of $his boobs<<else>>cupped over one of her $activeSlave.nipples nipples<</if>> and hugging her against your <<if $PC.boobs == 1>>bosom<<else>>hard chest<</if>>. $He pants exhaustedly in your arms as you take her, and when $he climaxes, she manages only a weak ejaculation onto the couch. You have mercy and fuck her harder, bringing yourself to a quicker orgasm and letting her fall into $his own mess. "I @@.hotpink;love you,@@
 	<<Master>>," $he mumbles into the cushions.
@@ -576,7 +576,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 	<</replace>>
 <</link>>
 <br><<link "Give $him some loving praise">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You stand up, give $him a kiss, and sit down on the couch, pulling $him into your lap. $His <<if $activeSlave.butt > 8>>monstrous ass rests heavily on<<elseif $activeSlave.muscles > 30>>heavily muscled ass is hard against<<elseif $activeSlave.weight > 10>>plush bottom is soft against<<elseif $activeSlave.muscles > 10>>toned butt is firm against<<elseif $activeSlave.butt > 3>>healthy butt is soft against<<else>>cute bottom is firm against<</if>> your toned thighs. $He wiggles $himself against you briefly, as though to gently remind you $he's available without demanding anything, and then snuggles $his $activeSlave.skin face into your neck. You run a hand <<if $activeSlave.hLength == 0>>across $his bald head<<elseif $activeSlave.hLength < 10>>through $his short hair<<else>>through $his $activeSlave.hColor hair<</if>>, producing a shiver of pleasure as your fingers massage $his scalp. As you cuddle with your Head Girl, you praise $his hard work, and tell $him that the next generation of sex slaves in the Free Cities will owe a lot to $him. They'll learn from $his leadership, of course, but they'll also have $his genes. $He stiffens a little, and there's a slight moisture against your skin as tears begin to run down $his cheeks. $He cranes $his neck up and @@.hotpink;kisses you rapturously.@@ $He seems to have absorbed a bit of your vision for the future, and over the next couple of days $he takes special care to make sure the slaves in your penthouse @@.mediumaquamarine;know their place in the new world you're building.@@
 	<<set $activeSlave.devotion += 5>>
diff --git a/src/uncategorized/PETS.tw b/src/uncategorized/PETS.tw
index 57c9a5400f2ea572235777d979e8972cae299e3b..fb707fe1bb1eb3f94168ce7b23fc87b4136f54bd 100644
--- a/src/uncategorized/PETS.tw
+++ b/src/uncategorized/PETS.tw
@@ -122,7 +122,7 @@ You decide to knit up care's raveled sleave with a break in the spa. You have yo
 <<case "nurse molestation">>
 
 <<link "Punish $him for molesting patients">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	The next morning, the Clinic's patients awake to see an uncharacteristically subdued $activeSlave.slaveName hurrying around, doing $his best to see to $his business quietly. $He does so a bit gingerly, as though $he was fucked without mercy last night, and tries not to meet anyone's eyes. Their attention is immediately drawn, however, to a sign pinned to the chest of $his clothing. It reads, 'The Nurse was caught molesting patients last night. $He has been ordered to immediately perform oral sex on anyone who asks.' Every patient instantly demands oral sex, and by the time $he's gotten the last one off, the first has placed another request. $He's exhausted by the end of the day; the patients, on the other hand, are @@.mediumaquamarine;very pleased@@ to see the haughty, handsy nurse brought low.
 	<<set $activeSlave.devotion += 4>>
@@ -144,7 +144,7 @@ You decide to knit up care's raveled sleave with a break in the spa. You have yo
 <</link>>
 <<if canDoVaginal($activeSlave) || canDoAnal($activeSlave)>>
 <br><<link "Rape $him for molesting patients">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You shove $activeSlave.slaveName hard, forcing a surprised shriek out of $him as $he crashes forward into $subSlave.slaveName's <<if $subSlave.boobs > 2000>>helpfully pillowlike bosom<<elseif $subSlave.boobs > 500>>healthy tits<<else>>chest<</if>>, and then ram your pelvis up against $him, pinning $him against $his patient. $subSlave.slaveName's eyelids flicker, but _he2 does not wake up, despite your assault <<if _canUseDick == 1>>shoving $activeSlave.slaveName's cock as far up _his2 asshole as it will go<<else>>trapping $activeSlave.slaveName's hands between them and pushing $his fingers even farther up $subSlave.slaveName's asshole<</if>>. $activeSlave.slaveName tries to shift a little, but receives a peremptory push back to where $he was. $He realizes $he's to lie still and take what's coming to $him, and $he does $his best to relax.
 	<br><br>
@@ -200,7 +200,7 @@ You decide to knit up care's raveled sleave with a break in the spa. You have yo
 <</if>>
 <<if canDoVaginal($activeSlave) || canDoAnal($activeSlave)>>
 <br><<link "Have sex with $him while $he molests the patient">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You announce your presence to $activeSlave.slaveName by groping $his <<if $subSlave.butt > 7>>absurd butt<<elseif $subSlave.butt > 3>>generous buttocks<<else>>cute behind<</if>>. $He jumps, startled, and emits a short scream of surprise that trails off into a moan of sexual anticipation as you continue to knead and massage $his $activeSlave.skin bottom. $He starts thrusting again, but carefully, so gently that $he doesn't need to stop for you to insert
 	<<if $PC.dick == 1>>
@@ -254,7 +254,7 @@ You decide to knit up care's raveled sleave with a break in the spa. You have yo
 <<case "stewardess beating">>
 
 <<link "Fuck the servant's mouth as the stewardess beats _him2">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	In a conversational tone of voice, you tell $activeSlave.slaveName to continue the spanking. $subSlave.slaveName has one anguished second to realize what's happening before you shove yourself <<if ($PC.dick == 0)>>against _his2 mouth<<else>>down _his2 throat<</if>>. _He2 gags reflexively, jerking back, only to jerk forward again in automatic pain avoidance when $activeSlave.slaveName hits _his2 already-sore buttocks yet again. _He2's broken enough to understand that _he2 needs to relax and let _himself2 be abused, but _his2 body's reflexive responses deny _him2 the relief that might be given. The sadistic stewardess @@.hotpink;comes twice@@ before you do, a deliciously aggressive expression on $his face. Poor $subSlave.slaveName staggers off coughing, promising to @@.gold;never offend@@ again.
 	<<set $activeSlave.devotion += 4>>
@@ -263,7 +263,7 @@ You decide to knit up care's raveled sleave with a break in the spa. You have yo
 	<</replace>>
 <</link>>
 <br><<link "Make sure your stewardess remembers $his place">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	In a conversational tone of voice, you tell $activeSlave.slaveName to continue the spanking. You watch the milieu impassively, your presence slightly cramping $his style. The poor beaten servant staggers out of the room when fully punished; $activeSlave.slaveName didn't bring $himself to climax, obviously over concern about why you're taking such an interest. When you tell $him that $he needs to remember that $he is a slave, too, and only superior to $his charges by degree, $his face falls. $He has a few seconds to wonder what $his punishment will be before $he finds $himself shoved roughly up against the wall. When $he feels <<if ($PC.dick == 0)>>a strap-on<<else>>your cockhead<</if>> pressing against $his <<if $activeSlave.anus > 2>>massive<<elseif $activeSlave.anus > 1>>loose<<else>>tight<</if>> anus, $he tries to hike a leg up to save $himself a bit of anal pain, but to little avail. <<if $activeSlave.anus > 2>>Since $his ass is so loose, you push two fingers in alongside <<if ($PC.dick == 0)>>the phallus<<else>>your dick<</if>>, eliciting a shocked whine.<<elseif $activeSlave.anus > 1>>$His butt may be well-used, but you pound $him hard enough to let $him know $he's still your butthole bitch.<<else>>$His ass is so tight that fucking it standing is punishment enough.<</if>> $He submissively takes $his buttfuck, and begs your forgiveness when $he feels you <<if ($PC.dick == 0)>>shoot your load up $his ass<<else>>shudder with orgasm<</if>>.
 	<<= AnalVCheck()>>
@@ -274,7 +274,7 @@ You decide to knit up care's raveled sleave with a break in the spa. You have yo
 <<case "aggressive schoolteacher">>
 
 <<link "Encourage the schoolteacher to abuse poor students">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You lean against the doorway of the classroom. $activeSlave.slaveName glances at you, but you subtly let $him know to continue with $his business. When $he finishes the lesson and, around the same time, climaxes, you clear your throat. The students all start with surprise and turn to you with trepidation. You observe in a conversational tone of voice that $activeSlave.slaveName is making great sacrifices here, performing an unsexy, boring job, and that any slave that does not work hard to learn will find themselves at the teacher's sexual disposal. Several of the least attentive students @@.green;try to look studious,@@ though a few of the better ones can't hide a certain anticipation.
 	<<run $slaves.forEach(function(s) {
@@ -287,7 +287,7 @@ You decide to knit up care's raveled sleave with a break in the spa. You have yo
 	<</replace>>
 <</link>>
 <br><<link "Take the delinquent student in hand">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	When $activeSlave.slaveName finishes using $subSlave.slaveName's mouth, $subSlave.slaveName crawls out from under _his2 desk and stumbles back towards _his2 seat. _He2 stops short when _he2 realizes you're sitting in it. All the other students do their absolute best to be perfectly studious as $subSlave.slaveName gets back to _his2 knees, for you this time. After class is over, you tell _him2 that since _he2 can't have been paying particularly good attention, _he2'll have to take @@.green;remedial classes@@ after everyone else is done. $activeSlave.slaveName gives $subSlave.slaveName a very thorough grope at 'remedial classes,' making sure to pinch $his student's nipples.
 	<<set $subSlave.oralCount += 1, $oralTotal += 1, $subSlave.intelligenceImplant += 0.5>>
@@ -298,7 +298,7 @@ You decide to knit up care's raveled sleave with a break in the spa. You have yo
 <<case "abusive wardeness">>
 
 <<link "Encourage the use of sleep deprivation as a breaking tool">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You let $activeSlave.slaveName know that as far as you're concerned, sleep is a privilege, not a right. $He grins evilly and grinds $himself into $subSlave.slaveName's mouth harder. The poor prisoner <<if canHear($subSlave)>>heard you, of course<<else>>realizes why $activeSlave.slaveName has increased $his brutality<</if>>, and begins to produce muffled sobs as _he2 realizes what this means for _him2. $activeSlave.slaveName reaches down and caresses _his2 cheek. "There, there," $he croons. "It'<<s>> not rape if you do it in return for <<s>>omething." All the prisoners are all that much more @@.hotpink;broken@@ this week, though sleep deprivation @@.red;isn't healthy.@@
 	<<run $slaves.forEach(function(s) {
@@ -310,7 +310,7 @@ You decide to knit up care's raveled sleave with a break in the spa. You have yo
 	<</replace>>
 <</link>>
 <br><<link "Have a quiet word with the Wardeness about prisoners' health">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You let $activeSlave.slaveName finish using $subSlave.slaveName's mouth, turn off the lights in _his2 cell, and then meet $him outside. It won't do to undermine $him in front of the prisoners. You offer a few choice remarks on the value of $his charges to you and the potential effects of sleep deprivation, and point out that $he is a poor Wardeness if $he cannot break slaves without taking measures that may damage their health. $He's clearly filled with remorse, begs your forgiveness, and manages to break slaves just as effectively this week while taking @@.green;better care@@ of their health.
 	<<run $slaves.forEach(function(s) {
@@ -322,7 +322,7 @@ You decide to knit up care's raveled sleave with a break in the spa. You have yo
 <</link>>
 <<if ($subSlave.anus > 0) && canDoAnal($subSlave)>>
 <br><<link "The prisoner will take it up the butt, too, if _he2 wants sleep">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You silently interrupt $activeSlave.slaveName and indicate that $he should sit down on the cell's bed without letting $subSlave.slaveName's head out from between $his legs. $He sits down with a thump, dragging the struggling $subSlave.slaveName with $him. You<<if ($PC.dick == 0)>> pull on a strap-on, and then<</if>> seize $subSlave.slaveName's hips and hoist them into the air, giving _him2 a horrible second of anticipation as you manhandle <<if ($PC.dick == 0)>>the cruelly large phallus<<else>>your cock<</if>> into place. _He2 gives a strangled squeal of protest at the feeling of you pushing your way inexorably up _his2 poor anus, making $activeSlave.slaveName jerk with surprise at the sensation of $subSlave.slaveName howling into $his crotch. Twenty minutes later, you and $activeSlave.slaveName leave _him2 @@.hotpink;quiescent@@ on the floor of the cell. After $he locks the door after $himself, $activeSlave.slaveName can't resist the urge to @@.hotpink;offer you a cheerful high-five.@@
 	<<set $activeSlave.devotion += 10, $activeSlave.oralCount += 1, $oralTotal += 1>>
@@ -333,7 +333,7 @@ You decide to knit up care's raveled sleave with a break in the spa. You have yo
 <</if>>
 <<if ($subSlave.vagina > 0) && canDoVaginal($subSlave)>>
 <br><<link "The prisoner will take it up the pussy, too, if _he2 wants sleep">>
-	<<replace "#name">>$activeSlave<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You silently interrupt $activeSlave.slaveName and indicate that $he should sit down on the cell's bed without letting $subSlave.slaveName's head out from between $his legs. $He sits down with a thump, dragging the struggling $subSlave.slaveName with $him. You<<if ($PC.dick == 0)>> pull on a strap-on, and then<</if>> seize $subSlave.slaveName's hips and hoist them into the air, giving _him2 a horrible second of anticipation as you manhandle <<if ($PC.dick == 0)>>the cruelly large phallus<<else>>your cock<</if>> into place. _He2 gives a strangled squeal of protest at the feeling of you pushing your way inexorably up _his2 poor pussy, making $activeSlave.slaveName jerk with surprise at the sensation of $subSlave.slaveName howling into $his crotch. Twenty minutes later, you and $activeSlave.slaveName leave _him2 @@.hotpink;quiescent@@ on the floor of the cell. After $he locks the door after $himself, $activeSlave.slaveName can't resist the urge to @@.hotpink;offer you a cheerful high-five.@@
 	<<set $activeSlave.devotion += 10, $activeSlave.oralCount += 1, $oralTotal += 1>>
@@ -346,7 +346,7 @@ You decide to knit up care's raveled sleave with a break in the spa. You have yo
 <<case "comforting attendant">>
 
 <<link "Meet with the Attendant later to see if the slave $he's helping can be assisted further">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You meet $activeSlave.slaveName after $subSlave.slaveName leaves. $He likes to take a cool shower after spending time in the steam, so you get under the refreshing water with $him, encircling $his <<if ($activeSlave.weight > 10)>>plush<<else>>taut<</if>> midriff with your arms and giving $him a hug before asking $him about $subSlave.slaveName. In $activeSlave.slaveName's opinion, there's nothing really wrong with _him2: _he2's just having a little trouble accepting different expectations about human interactions. "_He2 ju<<s>>t need<<s>> a little help a<<cc>>epting that _he2'<<s>> a <<s>>lave and it'<<s>> _his2 place to serve you, <<Master>>," $he says. "Like I have!" $He wriggles around in your arms and plants a wet kiss on your nose. $He's clean now, so you release $him and $he steps over to $his towel. As $he does, you land a wet slap on $his <<if ($activeSlave.butt > 5)>>massive<<elseif ($activeSlave.butt > 3)>>big<<else>>nice<</if>> butt, eliciting a @@.hotpink;delighted@@ squeal. You use the information to @@.hotpink;subtly address@@ $subSlave.slaveName's unhappiness.
 	<<set $activeSlave.devotion += 4>>
@@ -355,7 +355,7 @@ You decide to knit up care's raveled sleave with a break in the spa. You have yo
 	<</replace>>
 <</link>>
 <br><<link "Leave the matter between the Attendant and the slave $he's helping">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You let $activeSlave.slaveName deal with $subSlave.slaveName's troubles; after a short time $he sends $subSlave.slaveName off to shower, and submerges, swimming over to you under the water. $He pokes out of the water, comically letting a huge mouthful of the warm, healthy mineral water run out of $his mouth in a stream before giggling at $himself and smiling at you. "<<Master>>, would you like me to tell you about $subSlave.slaveName?" $he asks. You shake your head, and tell $him no, you trust $him to do $his best to heal anything that ails $his charges. $He looks at you with huge $activeSlave.eyeColor eyes for a long moment before throwing $his <<if ($activeSlave.weight > 10)>>plush<<else>>taut<</if>> body into your arms. $He looks up at you and asks incredulously, "<<Master>>, you trust me?" You nod. $He looks shocked but kisses you and drops back down under the water. You feel the lovely sensation of $his <<if ($activeSlave.lips > 70)>>massive<<elseif ($activeSlave.lips > 40)>>pillowlike<<else>>nice<</if>> lips <<if ($PC.vagina == 1)>>nibbling their way up towards your clit<<else>>forming a seal around your dickhead<</if>>, and although $he has to come up periodically for air, $he gives you quite a @@.hotpink;loving@@ blowjob.
 	<<set $activeSlave.devotion += 10>>
diff --git a/src/uncategorized/RECI.tw b/src/uncategorized/RECI.tw
index 8a0870b962a1277de7d8d80b1ac6ba1e27bfb172..696959f80950bbab09ad32f9b719aa2333fbf135 100644
--- a/src/uncategorized/RECI.tw
+++ b/src/uncategorized/RECI.tw
@@ -285,7 +285,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
 <<if ($HeadGirl.dick == 0) || (($HeadGirl.dick > 1) && canAchieveErection($HeadGirl) && ($HeadGirl.dickAccessory != "chastity"))>>
 <<link "Double anal with the Head Girl">>
 	<<setLocalPronouns $HeadGirl 2>>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You tell $him $he's got a nice asspussy, and grope $him thoroughly, cupping $his buttocks with one hand and squeezing a breast with the other. $ looks <<if ($activeSlave.fetish == "buttslut") && ($activeSlave.fetishKnown == 1)>>desperately eager<<else>>ready and willing<</if>>, and angles $himself just right, but you administer a light slap to $his $activeSlave.skin ass and continue, telling $him that it's so nice you feel like sharing it. $He's <<if ($activeSlave.fetish == "buttslut") && ($activeSlave.fetishKnown == 1)>>so ready to fuck $he can't quite think of what to say<<else>>not quite sure how to respond<</if>>, and before $he can figure it out, $HeadGirl.slaveName hurries in, responding to your summons. Of course, $activeSlave.slaveName is no stranger to $HeadGirl.slaveName, who takes in the situation at a glance and <<if $HeadGirl.dick > 0>>instantly achieves a painfully hard erection<<else>>immediately flushes with arousal<</if>>. $HeadGirl.slaveName<<if $HeadGirl.dick == 0>> dons a strap-on and<</if>> clambers up onto the (strongly built) bathroom counter. Since saliva is plenty of lube for $activeSlave.slaveName's experienced ass, _he2 points a meaningful finger at <<if $HeadGirl.dick == 0>>the phallus<<else>>_his2 cock<</if>>, and $activeSlave.slaveName begins to suck it enthusiastically, trying to get it as wet as possible for the sake of $his butt.
 	<br><br>
@@ -316,7 +316,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
 <<if ($Concubine.dick == 0) || (($Concubine.dick > 1) && canAchieveErection($Concubine) && ($Concubine.dickAccessory != "chastity") && ($Concubine.dickAccessory != "combined chastity"))>>
 <br><<link "Double anal with your Concubine">>
 	<<setLocalPronouns $Concubine 2>>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You tell $him $he's got a nice asspussy, and grope her thoroughly, cupping $his buttocks with one hand and squeezing a breast with the other. $He looks <<if ($activeSlave.fetish == "buttslut") && ($activeSlave.fetishKnown == 1)>>desperately eager<<else>>ready and willing<</if>>, and angles $himself just right, but you administer a light slap to $his $activeSlave.skin ass and continue, telling her that it's so nice you feel like sharing it. $He's <<if ($activeSlave.fetish == "buttslut") && ($activeSlave.fetishKnown == 1)>>so ready to fuck $he can't quite think of what to say<<else>>not quite sure how to respond<</if>>, and before she can figure it out, $Concubine.slaveName hurries in, responding to your summons. Of course, $activeSlave.slaveName is no stranger to $Concubine.slaveName, who takes in the situation at a glance and <<if $Concubine.dick > 0>>instantly achieves a painfully hard erection<<else>>immediately flushes with arousal<</if>>. $Concubine.slaveName<<if $Concubine.dick == 0>> dons a strap-on and<</if>> clambers up onto the (strongly built) bathroom counter. Since saliva is plenty of lube for $activeSlave.slaveName's experienced ass, she points a meaningful finger at <<if $Concubine.dick == 0>>the phallus<<else>>her cock<</if>>, and $activeSlave.slaveName begins to suck it enthusiastically, trying to get it as wet as possible for the sake of $his butt.
 	<br><br>
@@ -343,7 +343,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
 <</if>>
 <</if>>
 <br><<link "Chat about $his ass">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You head into the bathroom, shedding clothing as you go. $He stares at you as you advance, her eyes fixing on your <<if $PC.boobs>>tits as you reveal them<<else>>ripped abs as they become visible<</if>>, and her lips part slightly. $His gaze only shifts when you disrobe completely, revealing your <<if $PC.dick == 1>>hardening dick<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>flushed womanhood<</if>>; she licks her lips unconsciously. You grab a towel off the counter, spread it on a bathroom bench, and recline on it with your back against the wall. You pat your <<if $PC.title == 1>>hard<<else>>pretty<</if>> thighs, and she hurries over, <<if ($activeSlave.fetish == "buttslut") && ($activeSlave.fetishKnown == 1)>>eagerly<<else>>carefully<</if>> swinging her leg over the bench and seating $himself in your lap. <<if $PC.dick == 1>>Your cock slides easily up her whorish butt. One of your arms<<else>>You decided not to bother with a strap-on, so you slide a couple of fingers inside her, and she reciprocates by working a hand under $himself to attend to your pussy. Your free arm<</if>> wraps around her <<if $activeSlave.boobs > 4000>>and under her heavy tits, resting in a cocoon of soft breastflesh<<elseif $activeSlave.boobs > 800>>heavy breasts, hefting their weight and eliciting a sigh from the slave<<else>>to support her chest<</if>>. Being held this way, she can't really <<if $PC.dick == 1>>bounce on your dick, so she just wiggles her butt into you to seat it a bit deeper<<else>>grind against your fingers<</if>> and sighs contentedly. You instruct $him to elaborate on what $he said earlier.
 	<br><br>
@@ -353,7 +353,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
 <</link>>
 <<if $activeSlave.anus < 3>>
 <br><<link "Change it some more">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You tell $him that since $he appreciates how $his ass has changed, $he won't be surprised if you treat it like the fuckhole it is. Something in your tone makes her cautious, but $he's a good girl and says "Ye<<s>>, <<Master>>," automatically. You pass $assistantName wardrobe orders for the poor <<if $activeSlave.physicalAge > 30>>woman<<else>>girl<</if>>, and instructions to have her report to your office once $he's dressed. A few minutes later, $activeSlave.slaveName walks up to your desk, stark naked except for a buttplug that comfortably fills her rectum and a sturdy leather collar attached to a leash. You snap your fingers, pointing at the ground, and $he scrambles to her hands and knees and removes her plug. After $he's taken a harsh buttfuck, you <<if $PC.dick == 1>>push the plug back in without letting any of your cum escape<<else>>plug her up again<</if>> and attach the leash to your belt. You ignore your anal toy completely, letting her kneel next to you as you work - $he doesn't seem to want to sit, for some reason. For the rest of the day, her anus takes the full force of your libido. You fuck nothing else, confining your efforts to her backdoor, keeping her plugged when you aren't penetrating her. When you're bored, you hand her a dildo and tell her to take care of it $himself.
 	<br><br>
@@ -367,7 +367,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
 <<case "futa">>
 
 <<link "Love $him back">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You swing your legs up onto your desk and jump up onto its smooth surface, $his eyes tracking the <<if $PC.boobs == 1>>way it makes your breasts move<<else>>powerful way your muscles move your body<</if>>. When you pat the tops of your <<if $PC.title == 1>>hard<<else>>soft<</if>> thighs meaningfully, $he giggles happily and skips forward to clamber up and sit on her lap. The bouncing and climbing creates quite a nice spectacle of jiggling tits and waving cock, and $he manages to get up on the desk in such a way that you get a solid eyeful of first her wet pussy and then her ready anus. $He settles $himself onto your lap with a coo, feeling the <<if $PC.dick == 1>>hardness of your erection <<if $PC.vagina == 1>>and the warmth further down<</if>><<else>>warmth of your arousal<</if>> against her hermaphroditic genitalia. $He starts to grind $himself lasciviously against you, but stops when you seize $his face and kiss $him deeply. $He moans back into you, returning the kiss with intensity. <<if $activeSlave.boobs > 4000>>$His udders are so huge the two of you have to press your torsos hard together to make out, a delightful struggle that stimulates $his nipples quite a lot, to go by the way $he squeaks and giggles into your mouth.<<elseif $activeSlave.boobs > 2000>>$His bosom is are so big that making out face to face presses it quite hard between your torsos, which stimulates her nipples quite a lot, to go by the way $he squeaks and giggles into your mouth.<<elseif $PC.boobs == 1>>You undress without breaking your lip lock, bringing your bare breasts against $hers in a warm, loving embrace.<<else>>You strip without breaking your lip lock, bringing your heavily muscled chest against her soft breasts in a tender, loving embrace.<</if>> $His arousal builds rapidly and $he goes back to grinding, <<if $PC.dick == 1>>eventually getting $himself so hot that your dick slides into her almost without either of you meaning to make it happen. $He climaxes with you shortly, cumming all over her own breasts.<<else>>bringing you both to a shaking climax. $He cums all over her own breasts, coating them in glistening ejaculate.<</if>> As $he relaxes back against the desk, $his panting making $his cum-glazed tits rise and fall, you reflect that you just lied by omission, letting a pretty girl maintain $his delusions and @@.hotpink;$his love for you.@@ Of all your sins, this is perhaps the smallest.
 	<<set $activeSlave.devotion += 4>>
@@ -376,7 +376,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
 	<</replace>>
 <</link>>
 <br><<link "Break $him with the truth">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You point at the couch, and $he skips over to it with a giggle, boobs bouncing. $He hops up onto the cushions, kneeling with $his butt stuck out invitingly and her torso bent over its back. $He reaches around to pull one <<if ($activeSlave.butt > 5)>>massive<<elseif ($activeSlave.butt > 2)>>heavy<<else>>cute<</if>> buttock to one side, <<if $activeSlave.anus > 2>>stretching her lewd backdoor into a gape<<elseif $activeSlave.anus > 1>>stretching her backdoor lewdly<<else>>highlighting her tight anus<</if>> and showing off her <<if $activeSlave.labia > 1>>dangling<<elseif $activeSlave.labia > 0>>generous<<else>>wet<</if>> pussylips. You enter her from behind, your <<if $PC.dick == 1>>turgid dick<<else>>strap-on<</if>> sliding easily into her cunt. Your hands slide around her to hold her shoulders in a gentle lock, and you whisper secrets into her ear. You tell her that the Futanari Sisters here failed because you undermined them. You tell her that she is a slave because you planned and executed her enslavement. And you tell her that no slave will believe her if she tells them the truth, since they love you just like she did. As you pour this poison into her, she remains perfectly still, processing the revelation; the only clue to her feelings is her rapidly softening cock. When it has become completely, pathetically limp, a huge sob tears its way out of her. You switch to her anus and assrape her without mercy, forcing her limp torso halfway around so you can press a kiss on her bawling mouth. $He does not resist, even when you begin to taste the salt tears that stream down her pretty face. $He will remain devoted to you, mostly from a lack of alternatives, but her trust in you has @@.gold;suffered immensely.@@
 	<<set $activeSlave.trust = random(-90,-75)>>
@@ -390,7 +390,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
 <<case "orientation">>
 
 <<link "$He wants dick. Give $him the dick">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You rise fluidly out of your chair, pointing at the floor at her feet. $He needs no further direction, and hurriedly gets down to place her mouth at dick height. $He <<if ($PC.dick == 0)>>gives your strap-on a blowjob<<else>>sucks you off<<if $PC.vagina == 1>> and eats you out<</if>><</if>> with relish, looking adoringly up at you as she rhythmically works her lips up and down <<if ($PC.dick == 0)>>the<<else>>your<</if>> thick shaft. After a bit of this, you pull <<if ($PC.dick == 0)>>the phallus<<else>>yourself<</if>> free with a delicious popping noise, and haul the slave to her feet. You grab her arms in a firm hold and pull her up on tiptoe (at which the horny girl giggles with anticipation), and then thrust into <<if ($activeSlave.weight > 10)>>soft crevice between her plush thighs<<else>>gap between her thighs<</if>>. This motion slides <<if ($PC.dick == 0)>>the strap-on<<else>>your hard dick<</if>> <<if ($activeSlave.vagina > -1)>>against her moist pussylips<<elseif ($activeSlave.scrotum > 0)>>against her anus and then past her ballsack<<else>>along her sensitive perineum<</if>>, eliciting a shocked gasp and then a prolonged whine of pleasure. $He humps $himself along <<if ($PC.dick == 0)>>the phallus<<else>>your shaft<<if $PC.vagina == 1>> and mons<</if>><</if>> shamelessly, craning around to rain kisses on your jawline and neck.
 	<<if ($activeSlave.vagina > -1)>>
@@ -411,7 +411,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
 	<</replace>>
 <</link>>
 <br><<link "Send $him down to a gym to share that attraction around">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You bring up a schematic of the arcology and point out a public gym to her; you hand her a day pass, tell her to go down there, and let her know she'll spend the rest of the day there. $He looks mystified, and when you do not elaborate further, she asks, "What <<sh>>ould I do there, <<Master>>?" Anything she wants, you tell her. $He still looks somewhat puzzled, but she heads down to the gym anyway. When she gets there, she sees a steady stream of well-muscled male citizens entering the showers, and gets it. $He waves cheerfully to the nearest camera, and blows you a kiss before heading into the locker room. This is the Free Cities, and there isn't much reaction to a naked girl entering a male-dominated gym. That is, until she selects from among the sweaty gentlemen coming in from the weight room, sidles up to one, and says cheerfully, "Hi! Do you wanna fuck me?" He does, and @@.green;so do many of his friends.@@ So many, in fact, that having the showers right there becomes convenient for her as the day goes on.
 	<<set $rep += 250>>
@@ -439,7 +439,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
 <<case "MILF">>
 
 <<link "Then $he can appreciate a nice struggle fuck">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	When $he sees you stand up from behind your desk<<if ($PC.dick == 0)>> and pull on a strap-on<</if>>, she smiles invitingly at you and relaxes. But as you approach, she sees a dangerous glint in your eyes. One corner of her mouth flaws upward with anticipation, and she plays along. $He immediately curls up into a ball on the couch, managing to end up with her <<if ($activeSlave.weight > 30)>>fat ass squashed enticingly against the seat back<<elseif ($activeSlave.butt > 5)>>absurd ass squashed enticingly against the seat back<<elseif ($activeSlave.butt > 2)>>healthy ass pushed against the seat back<<else>>trim ass against the seat back<</if>>. $He looks up at you with feigned terror and begs, "Plea<<s>>e, <<Master>>, I'm ju<<s>>t an inno<<c>>ent little girl. Plea<<s>>e don't rape my poor little butt!" You grab an ankle and haul her <<if ($activeSlave.weight > 10)>>plush<<elseif ($activeSlave.muscles > 5)>>toned<<else>>slender<</if>> $activeSlave.skin body toward you, dragging her across the couch, and then half-fall atop her, pushing <<if ($PC.dick == 0)>>the strap-on<<else>>your hard cock<</if>> up the wriggling girl's butt. $He keeps begging and whining, but $he's managed to bring a hand under $himself and is
 	<<if ($activeSlave.dick > 0) && ($activeSlave.dickAccessory == "chastity")>>
@@ -458,7 +458,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
 	<</replace>>
 <</link>>
 <br><<link "Appreciate $his body">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You stand up from behind your desk<<if ($PC.dick == 0)>>and pull on a strap-on<</if>> and approach her, appreciating $his gorgeous body, all laid out across the couch for your perusal. When you reach her, you hold out a hand for one of $hers; $he takes it @@.mediumaquamarine;trustingly,@@ $his grip <<if ($activeSlave.muscles > 30)>>strong and sure<<elseif ($activeSlave.muscles > 5)>>firm and warm<<else>>soft and feminine<</if>>. You pull her up to kneel on the couch cushions, facing a mirrored wall of the room. $He's treated to a view of $his own face as you gently penetrate her from behind, holding your <<if ($PC.boobs == 0)>>strong chest<<else>>soft breasts<</if>> hard against $his <<if ($activeSlave.muscles > 30)>>ripped<<elseif ($activeSlave.muscles > 5)>>toned<<else>>warm<</if>> back. Once you're seated in $his <<if ($activeSlave.vagina > -1) && ($activeSlave.vaginalAccessory != "chastity belt")>>womanhood<<else>>anus<</if>>, you let your hands rove across $his body, resting your chin on one of $his shoulders to watch the view with her.
 	You run your fingers through <<if ($activeSlave.hLength < 10)>>across $his scalp, eliciting a sigh<<elseif ($activeSlave.hLength < 50)>>through $his short hair and across $his scalp, eliciting a sigh<<elseif ($activeSlave.hLength < 100)>>all through $his long, luxurious hair<<else>>down the immense length of $his hair, bringing it around to cascade down between $his breasts<</if>>.
@@ -477,7 +477,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
 	<</replace>>
 <</link>>
 <br><<link "Put the horny old girl to work">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You tell $him that you've hired $him out for a party hosted by a prominent citizen's son, home from college, and that $he should be saving it for that. $He promises that $he will, bringing $his legs together again and clearly already imagining it. You check in on her later, using the video feeds, and are treated to the sight of $him wearing a recently-acquired, too-tight t-shirt with an old world college's mascot on it as she rides a dick young enough to be $his son's. There's some drunken yelling, which she responds to by blowing kisses and licking $his <<if $activeSlave.lips > 0>>plump <</if>>lips until another cock finds its way into $his mouth. $His fee for the night is @@.yellowgreen;substantial,@@ and the student's father attaches a note to the payment. Apparently she got him too, and he's interested in hiring $him for a business meeting next month.
 	<<set $cash += 500>>
@@ -491,7 +491,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
 <<case "feminization">>
 
 <<link "Yes $he can">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	When $he sees you stand up from behind your desk<<if ($PC.dick == 0)>>and pull on a strap-on<</if>>, $he turns fully away from you, cocking $his hips at just the right angle to offer you $his anus, without any preamble or foreplay. But you come up behind her and encircle $his <<if ($activeSlave.belly >= 1500)>><<if $activeSlave.preg > 5>>pregnant <<else>>rounded <</if>>belly<<elseif ($activeSlave.weight > 10)>>plush belly<<elseif ($activeSlave.muscles > 5)>>toned stomach<<else>>trim waist<</if>> with your capable hands, your lips nibbling along the line of $his <<if ($activeSlave.muscles > 30)>>strong<<elseif ($activeSlave.muscles > 5)>>toned<<else>>soft<</if>> shoulders and neck. $He shudders as the embrace brings your <<if ($PC.dick == 0)>>strap-on<<else>>dick<</if>> <<if ($activeSlave.height >= 185)>>up between $his buttocks, since she's nearly as tall as you<<elseif ($activeSlave.height >= 170)>>pressing into $his asscrack, since she's shorter than you<<else>>nestling down into $his asscrack, since she's so much shorter than you<</if>>. You whisper that a good slave girl doesn't have to touch $himself to come when $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>> fucks $his butt, and ask whether she's a good slave girl. $He shivers and promises that she is, rubbing $his asshole against your <<if ($PC.dick == 0)>>phallus<<else>>cockhead<</if>>. $He gives a feminine sigh as it slides into her, and moves softly within your embrace, doing $his best to pleasure you with $his girly ass. $He was already very close, and your loving touch so aroused her that she gasps and stiffens after only a few thrusts,
 	<<if ($activeSlave.dick > 0) && ($activeSlave.dickAccessory == "chastity")>>
@@ -508,7 +508,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
 	<</replace>>
 <</link>>
 <br><<link "$He's a good slave girl all the time, not just right now">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You tell her that she doesn't have to prove anything to you right now; she's shown that she's a good slave girl already. $He looks shocked for a moment before @@.mediumaquamarine;blushing and turning $his gaze down at $his feet.@@ "T-thank<<s>>, <<Master>>," she stammers. Since she asked so nicely, though, you continue, you will fuck $his butt. $He giggles and hurries over to you in response to a crooked finger, curling up in your lap for a nice makeout session. When the next slave scheduled for an examination comes through the door, it's to the sight of $activeSlave.slaveName holding $his body sideways in the air over the couch: she has one knee down on the cushions, and is doing the splits with the other leg running up <<if ($PC.boobs == 0)>>your muscular chest<<else>>between your breasts<</if>>. Your <<if ($PC.dick == 0)>>strap-on<<else>>dick<</if>> is up $his ass, and you're giving it to her hard. <<if ($activeSlave.boobs > 1000)>>$His huge breasts are bouncing back and forth with the motion, almost hitting $himself in the face.<<elseif ($activeSlave.weight > 10)>>$His generous curves lend the motion weight, and each thrust reams $his ass hard.<<elseif ($activeSlave.hLength >= 60)>>$His long hair flies around $his face in a maelstrom of sexual energy.<<else>>The leather couch creaks with an obscurely sexual rhythm.<</if>> $He's being fucked so hard that $his
 	<<if ($activeSlave.dick > 0) && ($activeSlave.dickAccessory == "chastity")>>
@@ -525,7 +525,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
 	<</replace>>
 <</link>>
 <br><<link "Good slave girls earn money">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You tell $him that you've hired her out for a party a prominent citizen is throwing, and that $he should be a good slave girl by saving $himself for that. $He trips all over $himself promising that $he will. You check in on her later, using the video feeds, and are treated to the sight of her wearing a slinky cocktail dress, although wearing is perhaps the wrong term. $He's bent over a barstool with the top of the dress pulled down <<if ($activeSlave.boobs > 1000)>>over $his huge tits<<elseif ($activeSlave.boobs > 300)>>to bare $his boobs<<else>>to reveal $his sissy chest<</if>> and the bottom of $his dress hiked up so a guest can fuck $his ass. $He's obviously enjoying $himself, happy to be getting some at last. $His fee for the night is @@.yellowgreen;substantial,@@ and the host attaches a note to the payment, complimenting $his eagerness to get assfucked and $his willingness to suck cock, and asking when she'll be available next.
 	<<set $cash += 500>>
@@ -539,7 +539,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
 <<case "ugly">>
 
 <<link "$He's pretty enough to decorate your arm for a night out">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You tell her to head down to the wardrobe and put on the outfit that'll be laid out for her there. $He obeys promptly, but does not return for some time, having gotten instructions from $assistantName along the way to put extra effort into $his grooming. When she finally returns, the effect is striking. <<if $activeSlave.face > 10>>$He's a gorgeous girl with or without makeup, dressed up or naked, but she's especially luscious tonight.<<else>>$His face is not flawless, but she's conscious of $his transformation, and the new confidence in $his beauty adds a special glow that cannot be faked.<</if>> $His evening dress is elegant; it's quite slutty by old world standards, but according to Free Cities fashion, it's just about the most conservative gown a slave can be expected to wear, and quite daring in that it isn't immediately obvious whether she's a slave or not. The tops of $his areolae are hardly even visible.<br><br>
 	You take her out to a nice lounge, with blue-toned light and soft music. $He clings to your arm, pressing $himself against you just the right amount: not enough to demand sex right now, but enough to raise the anticipation of it later. $He's a slave, so she does not eat or drink the usual fare on offer, but the establishment is used to slaves and offers flavorful variation on liquid slave food. $He drinks the translucent fluid out of a tall glass, carefully maintaining $his poise. You circulate, leaving her at the bar when acquaintances appear. $He perches on a stool, conscious of and pleased by the discreet admiration of $his body, delectably outlined by the tight dress. Once a new arrival who did not see you with her introduces himself to her. He's tall and fit and silver-haired, but he picked her out of the room to approach, and it's with polite disappointment that he reacts to $his indication of you, across the room - "I'm <<s>>orry, <<S>>ir, that'<<s>> my <<Master>> there." He offers a nonverbal apology without coming over, which you accept with a wave: it's such a common mistake in Free Cities high society that it's universally brushed off without offense. It happens again later in the night, when a slightly tipsy free woman occupies the barstool next to $activeSlave.slaveName's and keeps trying to relax against her until the flattered slave explains $himself again. When you bring her home at the end of the night, $his eyes are shining with @@.mediumaquamarine;private assurance,@@ and she presses $himself against you more closely than ever.
@@ -549,7 +549,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
 	<</replace>>
 <</link>>
 <br><<link "Show her off online">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You tell her that she's become a very pretty sex slave, and to prove it, you set up a live feed for her that's available for free in the old world. The Free Cities produce an utter torrent of hardcore video, so much that there's never any profit to be made off it anymore, but viewers begin to join the channel anyway and by the end of the week $he has thousands of eyes watching her as she <<if $activeSlave.assignment == "whore">>sells $his body<<else>>has sex with random citizens<</if>> in the hallways of $arcologies[0].name. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> keeps her constantly informed of how many people are watching her get fucked, how many of them are likely masturbating to $his body, and how many inquiries about $him $assistantName is culling out of your inbox. $He slowly gets used to $his starring role in an impromptu free hardcore stream, but never quite stops stealing wondering glances at the nearest camera, as though she cannot believe that so many people would sexualize her. This lends her a naughtiness that cannot be faked, garnering $him @@.green;much attention@@ by the end of the week.
 	<<if ($activeSlave.fetish == "humiliation") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index b125f8a4741dc9e07af77189194903a30bc9159a..f7a09be4d8f891f8f9cc107d8ab0491380ef1935 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -1958,7 +1958,7 @@ At your <<if canSee($activeSlave)>>nod<<else>>acknowledgement<</if>>, $he
 
 <<set _possibleDrugs = []>>
 
-<span id="name"><<EventNameLink $activeSlave>></span> comes to see you, clearly in a good mood. Since $he's allowed to ask questions, $he comes right out with it.
+<<EventNameLink $activeSlave>> comes to see you, clearly in a good mood. Since $he's allowed to ask questions, $he comes right out with it.
 
 "<<Master>>, I'm feeling healthy, and I've been a good $girl thi<<s>> week. With everyone getting <<s>>o many powerful drug<<s>> -" $he takes a breath before asking in a rush "- may I have a do<<s>>e of
 
@@ -8893,9 +8893,7 @@ You tell her kindly that you understand, and that $he'll be trained to address t
 		<</link>>
 	<<else>>
 		<br><<link "The only dick $he should suck is her Mistress's">>
-		<<replace "#name">>
-			$activeSlave.slaveName
-			<</replace>>
+		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
 			$He's so occupied that $he doesn't hear you until you seize $his hair and pull her head back. $His massive dickhead pops free of $his mouth and $he squeaks in surprise. The noise is cut off by a gag as you ram yourself down her throat. $He plays with your <<if $PC.vagina == 1>>cunt<<else>>balls<</if>> as you face fuck $him and jacks off with her other hand. $He was so close when you intruded that $he cums long before you do. There's a lot of cum in the shower when you're through. <<if $activeSlave.balls == 3>>$His huge balls made an especially major contribution. <</if>>@@.hotpink;$He has become more submissive to you.@@
 			<<set $activeSlave.devotion += 4, $activeSlave.oralCount++, $oralTotal++>>
diff --git a/src/uncategorized/officeDescription.tw b/src/uncategorized/officeDescription.tw
index 3ea9f1a61b75a42882c2b0cb7f60cdeda9e00b9c..0f8951e500f475362b77595bc2d90ab29efb19fe 100644
--- a/src/uncategorized/officeDescription.tw
+++ b/src/uncategorized/officeDescription.tw
@@ -136,6 +136,8 @@
 					her anus. A pair of heavy balls hangs from her crotch.
 				<<elseif $arcologies[0].FSGenderRadicalistLawFuta == 3>>
 					her gigantic ass.
+				<<elseif $arcologies[0].FSGenderRadicalistLawFuta == 4>>
+					her anus. A tiny pair of balls hangs from her crotch.
 				<<else>>
 					her rear.
 				<</if>>
diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/uncategorized/personalAssistantAppearance.tw
index 26af241db8c7752ec6e675227ad517edde625513..68cc0f5ac9cb979adf27030677d63ff93640d619 100644
--- a/src/uncategorized/personalAssistantAppearance.tw
+++ b/src/uncategorized/personalAssistantAppearance.tw
@@ -1346,7 +1346,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantFS
 	<<elseif $marketAssistantRelationship == "nonconsensual">>
 		$assistantName has her test subject stripped and bound. She focuses a spell on a single of the girls breasts and records the results as it steadily begins swelling, leaving its twin behind. The market assistant moans as an egg pushes its way out of her erect nipple.
 	<<elseif $marketAssistantRelationship == "incestuous">>
-		$assistantName is lustfully groping her sister's plush breasts. Upon noticing your gaze, she channels her magic and <<if _paSeedicks != 0>>sprouts a huge dick straight into her sister's plump rear<<else>>begins to enlarge the already lovely handfuls<</if>>. The market assistant can only finger herself in response, oblivious to everything going on.
+		$assistantName is lustfully groping her sister's plush breasts. Upon noticing your gaze, she channels her magic and <<if $seedicks != 0>>sprouts a huge dick straight into her sister's plump rear<<else>>begins to enlarge the already lovely handfuls<</if>>. The market assistant can only finger herself in response, oblivious to everything going on.
 	<<else>>
 		They've pulled open each other's robes and are gently tribbing. Upon noticing you, $assistantName casts a spell to triple the market assistant's sensitivity and braces for the impending orgasm. She cums so hard she passes out; $assistantName gently pulls her into a close embrace until she recovers.
 	<</if>>
@@ -1485,7 +1485,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantFS
 	<<case "repopulation focus">>
 		Her belly is round with child and is in a constant struggle with her erect cock over which gets to protrude out her front.
 	<<case "eugenics">>
-		She's become even more irresistible lately; <<if $PC.vagina == 1>>you can help but think of that perfect cock cumming deep in your pussy and your belly rounding with a gorgeous child<<else>>the children sired by a stud are unimaginable<</if>>.
+		She's become even more irresistible lately; <<if $PC.vagina == 1>>you can help but think of that perfect cock cumming deep in your pussy and your belly rounding with a gorgeous child<<else>>the children sired by such a stud are unimaginable<</if>>.
 	<<case "gender radicalist">>
 		<<if $arcologies[0].FSGenderRadicalistLawFuta == 1>>
 			She is wearing nothing at all and has recently rendered herself slightly more feminine. She makes sure to make exaggerated motions to show off the pussy hidden beneath her swinging nuts.
@@ -1493,6 +1493,8 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantFS
 			She has recently increased the size of her genitals and has given up trying to wear pants; they just get in the way of her prominent erection.
 		<<elseif $arcologies[0].FSGenderRadicalistLawFuta == 3>>
 			She is wearing nothing at all; not that anything could fit her. Her cock and balls are utterly dwarfed by her door-jamming hips, massive ass and extra thick thighs.
+		<<elseif $arcologies[0].FSGenderRadicalistLawFuta == 4>>
+			She is wearing loose clothing and has recently rendered herself slightly more feminine. She does her best to appear the perfect little femboy despite what's slipping down her pant leg.
 		<<else>>
 			She is wearing nothing at all and has recently rendered herself even more handsome, since she was already a perfect fit for society.
 		<</if>>
@@ -1581,6 +1583,8 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantFS
 			She's leaning back with both hands wrapped around her huge cock, struggling to jack off. When she notices you watching, she invites you to lend a hand or two to help her out.
 		<<elseif $arcologies[0].FSGenderRadicalistLawFuta == 3>>
 			She is laying on her stomach, her ass and legs jiggling delightfully as she gives herself a thighjob. When she notices you watching, she struggles to roll onto her side and waves her throbbing erection at you, imploring you to finish her off.
+		<<elseif $arcologies[0].FSGenderRadicalistLawFuta == 4>>
+			She's got her hands down her pants absentmindedly jerking off. When she notices you watching, she quickly stops, but it does little to hide the large wetspot forming on her tented pants.
 		<<else>>
 			She's absentmindedly jerking off. When she notices you watching, she waves her throbbing erection at you, imploring you to finish her off.
 		<</if>>
diff --git a/src/uncategorized/reFormerAbolitionist.tw b/src/uncategorized/reFormerAbolitionist.tw
index ac3c546bd4b28ab10ede57203222524c7afad60e..578209995a7597f9f0305af1bb68c0bcd85ae857 100644
--- a/src/uncategorized/reFormerAbolitionist.tw
+++ b/src/uncategorized/reFormerAbolitionist.tw
@@ -20,9 +20,7 @@ This is a rare opportunity. While the mob is quick to pat itself on the back for
 
 <span id="result">
 <<link "Just capitalize on her popularity to increase your reputation">>
-	<<replace "#name">>\
-	$activeSlave.slaveName\
-	<</replace>>\
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 You spend the week parading $activeSlave.slaveName around in public, letting everyone get a good look at her fawning adoration of you. A variety of public sex acts really nails the point home in the psyche of your citizens and @@.yellowgreen;increases your reputation@@, and after a few days you start to receive a sincere golf clap from onlookers every time you cum in or on $activeSlave.slaveName.
 	<<set $rep += 200>>
@@ -30,9 +28,7 @@ You spend the week parading $activeSlave.slaveName around in public, letting eve
 <</link>>
 <span id="result">
 <br><<link "Just capitalize on her popularity by renting out her mouth">>
-	<<replace "#name">>\
-	$activeSlave.slaveName\
-	<</replace>>\
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 You fasten $activeSlave.slaveName in a kneeling position in the center of your club, secured by shackles around her wrists and ankles - purely decorative, since she's so devoted she'd perform her role in this if you just hinted it would please you if she did. In front of her, you place a sign: "Fuck the mouth that preached abolitionism, <<print cashFormat(5)>>." In a few moments, the morning crowd will begin to arrive, and you have no doubt that $activeSlave.slaveName will be very, very popular. And she is. Even with an extra dose of curatives and a check-up every night, the strain of a week of dicks and a diet of cum @@.red;has taken a toll on her health@@. But even after you pay to have the area that $activeSlave.slaveName worked thoroughly cleaned, you have made @@.yellowgreen;a tidy profit@@.
 	<<set $activeSlave.health -= 10>>
@@ -41,9 +37,7 @@ You fasten $activeSlave.slaveName in a kneeling position in the center of your c
 	<</replace>>
 <</link>>
 <br><<link "Invest <<print cashFormat(5000)>> in making her locally famous">>
-	<<replace "#name">>\
-	$activeSlave.slaveName\
-	<</replace>>\
+	<<EventNameDelink $activeSlave>>
 	<<if random(1,100) > 50>>
 		<<replace "#result">>
 You buy media coverage of her, invest in an ad campaign, and even arrange for her to give a speech denouncing the abolitionist movement and praising your efforts in fighting against them. Your efforts are a success. Her current extreme popularity will fade in time, but you have managed to arrange for her a permanent place as an @@.green;example of your slave-breaking skills.@@
@@ -61,9 +55,7 @@ You buy media coverage of her, invest in an ad campaign, and even arrange for he
 	<</if>>
 <</link>>
 <br><<link "Lavish <<print cashFormat(10000)>> on her locally famous">>
-	<<replace "#name">>\
-	$activeSlave.slaveName\
-	<</replace>>\
+	<<EventNameDelink $activeSlave>>
 	<<if random(1,100) > 10>>
 		<<replace "#result">>
 You buy prime media coverage of her, invest in a lavish ad campaign, and even arrange for her to give a speech denouncing the abolitionist movement and praising your efforts in fighting against them that is broadcast around the world. Your efforts are a success. Her current extreme popularity will fade in time, but you have managed to arrange for her a permanent place as an @@.green;example of your slave-breaking skills.@@
@@ -82,9 +74,7 @@ You buy prime media coverage of her, invest in a lavish ad campaign, and even ar
 <</link>>
 </span>
 <br><<link "Spend <<print cashFormat(25000)>> on an attempt to make her world famous">>
-	<<replace "#name">>\
-	$activeSlave.slaveName\
-	<</replace>>\
+	<<EventNameDelink $activeSlave>>
 	<<if random(1,100) > 50>>
 		<<replace "#result">>
 The world is in love with $activeSlave.slaveName. Her face graces magazine covers the world over and her passionate arguments (ghostwritten by the best spin doctors money can buy) spark debate everywhere they're heard. She is mentioned by name in strident denunciations about the immorality of the present day from religious leaders. She appears on the internet with all sorts of attempts at humor superimposed on her image. Her loving and overblown descriptions of you spark a new trend in protagonists of badly-written romance novels. When a very popular talk show host attempts to call her bluff and receives oral sex in front of a live studio audience, @@.yellowgreen;you know for sure that her fame has stuck@@.
diff --git a/src/uncategorized/reLegendaryBalls.tw b/src/uncategorized/reLegendaryBalls.tw
index 476daa560bd237df68bfe703d068e2baea1467c5..89df4c600c16239deea5c577086a112839f92cfb 100644
--- a/src/uncategorized/reLegendaryBalls.tw
+++ b/src/uncategorized/reLegendaryBalls.tw
@@ -19,9 +19,7 @@ This is a rare opportunity. The idea of cockmilking is new and understandably fa
 
 <span id="result">
 <<link "Fairly enter her in the livestock show">>
-	<<replace "#name">>
-	$activeSlave.slaveName
-	<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<if random(1,100) > 90>>
 		<<replace "#result">>
 		$activeSlave.slaveName is shown in public, closely inspected by the judging committee, and then publicly cockmilked. It's likely there was some bribery behind the scenes, but her massive junk wins the day. Against all odds she is named best in show, and will be @@.green;remembered@@ as cock stock of the highest pedigree. As her owner, your reputation has @@.green;also increased.@@
@@ -39,9 +37,7 @@ This is a rare opportunity. The idea of cockmilking is new and understandably fa
 	<</if>>
 <</link>>
 <br><<link "Spend <<print cashFormat(5000)>> bribing the judges">>
-	<<replace "#name">>
-	$activeSlave.slaveName
-	<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<if random(1,100) > 50>>
 		<<replace "#result">>
 		$activeSlave.slaveName is shown in public, closely inspected by the judging committee, and then publicly cockmilked. Several of the judges cannot resist giving you a wink as they look her over. $activeSlave.slaveName is unsurprisingly named best in show, and will be @@.green;remembered@@ as cock stock of the highest pedigree. As her owner, your reputation has @@.green;also increased.@@
@@ -61,9 +57,7 @@ This is a rare opportunity. The idea of cockmilking is new and understandably fa
 	<</if>>
 <</link>>
 <br><<link "Spend <<print cashFormat(10000)>> bribing the judges and sabotaging the competition">>
-	<<replace "#name">>
-	$activeSlave.slaveName
-	<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<if random(1,100) > 10>>
 		<<replace "#result">>
 		$activeSlave.slaveName is shown in public, closely inspected by the judging committee, and then publicly cockmilked. After she's put through her paces, the most unfortunate series of accidents somehow befalls her fellow cows. One is taken ill, another seems drugged, and someone seems to have slipped a finger of raw ginger up another's urethra, making her whine and squeal when cockmilked. $activeSlave.slaveName is unsurprisingly named best in show, and will be @@.green;remembered@@ as cock stock of the highest pedigree. As her owner, your reputation has @@.green;also increased.@@
diff --git a/src/uncategorized/reLegendaryCow.tw b/src/uncategorized/reLegendaryCow.tw
index 45a9b46cd48dabd6aaacb850ae11e5f014f036e1..2aacc1319de6fd857a1adb8f257259172bd7dfd1 100644
--- a/src/uncategorized/reLegendaryCow.tw
+++ b/src/uncategorized/reLegendaryCow.tw
@@ -19,9 +19,7 @@ This is a rare opportunity. The idea of human dairy is new and understandably fa
 
 <span id="result">
 <<link "Fairly enter her in the stock show">>
-	<<replace "#name">>
-	$activeSlave.slaveName
-	<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<if random(1,100) > 90>>
 		<<replace "#result">>
 		$activeSlave.slaveName is shown in public, closely inspected by the judging committee, and then publicly milked. It's likely there was some bribery behind the scenes, but her massive tits win the day. Against all odds she is named best in show, and will be @@.green;remembered@@ as dairy stock of the highest pedigree. As her owner, your reputation has @@.green;also increased.@@
@@ -39,9 +37,7 @@ This is a rare opportunity. The idea of human dairy is new and understandably fa
 	<</if>>
 <</link>>
 <br><<link "Spend <<print cashFormat(5000)>> bribing the judges">>
-	<<replace "#name">>
-	$activeSlave.slaveName
-	<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<if random(1,100) > 50>>
 		<<replace "#result">>
 		$activeSlave.slaveName is shown in public, closely inspected by the judging committee, and then publicly milked. Several of the judges cannot resist giving you a wink as they look her over. $activeSlave.slaveName is unsurprisingly named best in show, and will be @@.green;remembered@@ as dairy stock of the highest pedigree. As her owner, your reputation has @@.green;also increased.@@
@@ -61,9 +57,7 @@ This is a rare opportunity. The idea of human dairy is new and understandably fa
 	<</if>>
 <</link>>
 <br><<link "Spend <<print cashFormat(10000)>> bribing the judges and sabotaging the competition">>
-	<<replace "#name">>
-	$activeSlave.slaveName
-	<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<if random(1,100) > 10>>
 		<<replace "#result">>
 		$activeSlave.slaveName is shown in public, closely inspected by the judging committee, and then publicly milked. After she's put through her paces, the most unfortunate series of accidents somehow befalls her fellow cows. One is taken ill, another seems drugged, and someone seems to have slipped a finger of raw ginger up another's ass, making her whine and squeal constantly. $activeSlave.slaveName is unsurprisingly named best in show, and will be @@.green;remembered@@ as dairy stock of the highest pedigree. As her owner, your reputation has @@.green;also increased.@@
diff --git a/src/uncategorized/reLegendaryEntertainer.tw b/src/uncategorized/reLegendaryEntertainer.tw
index 641ea80634f18e887851b2619a625341e435320d..9f805ea1bc881ade2c0c4f6a36b441eead7aa613 100644
--- a/src/uncategorized/reLegendaryEntertainer.tw
+++ b/src/uncategorized/reLegendaryEntertainer.tw
@@ -19,18 +19,14 @@ This is a rare opportunity. Such popularity and fame is here today, and gone tom
 
 <span id="result">
 <<link "Just capitalize on her popularity as it is">>
-	<<replace "#name">>
-	$activeSlave.slaveName
-	<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You decide to limit your advantage on her temporary popularity to a little publicity and some advertising. You've gained a little @@.green;notoriety.@@
 	<<set $rep += 200>>
 	<</replace>>
 <</link>>
 <br><<link "Invest <<print cashFormat(5000)>> in her image">>
-	<<replace "#name">>
-	$activeSlave.slaveName
-	<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<if random(1,100) > 50>>
 		<<replace "#result">>
 		You buy media coverage of her, invest in an ad campaign, and even arrange for persons of influence and taste to sample and review her gentle caresses. Your efforts are a success. Her current extreme popularity will fade in time, but you have managed to arrange for her a permanent place as a @@.green;respected and famous courtesan.@@ As her owner, your reputation has @@.green;also increased.@@
@@ -52,9 +48,7 @@ This is a rare opportunity. Such popularity and fame is here today, and gone tom
 	<</if>>
 <</link>>
 <br><<link "Lavish <<print cashFormat(10000)>> on her fame">>
-	<<replace "#name">>
-	$activeSlave.slaveName
-	<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<if random(1,100) > 10>>
 		<<replace "#result">>
 		You buy prime media coverage of her, invest in a lavish ad campaign, and even arrange for persons of great influence and fine taste to sample and review her gentle caresses. Your efforts are a success. Her current extreme popularity will fade in time, but you have managed to arrange for her a permanent place as a @@.green;respected and famous courtesan.@@ As her owner, your reputation has @@.green;also increased.@@
diff --git a/src/uncategorized/reLegendaryWhore.tw b/src/uncategorized/reLegendaryWhore.tw
index 76abc2c057e9e12688bb9056b94285f7ecfa8d93..bbabccf43189bc8e49aa8082843ac7cc0a7058c3 100644
--- a/src/uncategorized/reLegendaryWhore.tw
+++ b/src/uncategorized/reLegendaryWhore.tw
@@ -19,9 +19,7 @@ This is a rare opportunity. Such popularity and fame is here today, and gone tom
 
 <span id="result">
 <<link "Just capitalize on her popularity as it is">>
-	<<replace "#name">>
-	$activeSlave.slaveName
-	<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You decide to limit your advantage on her temporary popularity to a little marketing and some minor price increases. You've made some unexpected @@.yellowgreen;profits,@@ and gained a little @@.green;notoriety.@@
 	<<set $cash += 1000>>
@@ -29,9 +27,7 @@ This is a rare opportunity. Such popularity and fame is here today, and gone tom
 	<</replace>>
 <</link>>
 <br><<link "Invest <<print cashFormat(5000)>> in her notoriety">>
-	<<replace "#name">>
-	$activeSlave.slaveName
-	<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<if random(1,100) > 50>>
 		<<replace "#result">>
 		You buy media coverage of her, invest in an ad campaign, and even arrange for persons of influence and taste to sample and review her many delights. Your efforts are a success. Her current extreme popularity will fade in time, but you have managed to arrange for her a permanent place as a @@.green;notorious and very popular prostitute.@@ As her owner, your reputation has @@.green;also increased.@@
@@ -51,9 +47,7 @@ This is a rare opportunity. Such popularity and fame is here today, and gone tom
 	<</if>>
 <</link>>
 <br><<link "Lavish <<print cashFormat(10000)>> on her fame">>
-	<<replace "#name">>
-	$activeSlave.slaveName
-	<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<if random(1,100) > 10>>
 		<<replace "#result">>
 		You buy prime media coverage of her, invest in a lavish ad campaign, and even arrange for persons of great influence and fine taste to sample and review her many delights. Your efforts are a success. Her current extreme popularity will fade in time, but you have managed to arrange for her a permanent place as a @@.green;notorious and very popular prostitute.@@ As her owner, your reputation has @@.green;also increased.@@
diff --git a/src/uncategorized/reRelationshipAdvice.tw b/src/uncategorized/reRelationshipAdvice.tw
index 3e9c9f4c03491a3f768056510f2e6ffe06a9a369..e3740ea0763078b50f3ab723cc6c403d86feabe7 100644
--- a/src/uncategorized/reRelationshipAdvice.tw
+++ b/src/uncategorized/reRelationshipAdvice.tw
@@ -27,9 +27,7 @@ She nods her head quickly, still staring at her feet. She shuts her eyes tight a
 
 <span id="result">
 <br><<link "Break them up">>
-	<<replace "#name">>\
-	$activeSlave.slaveName\
-	<</replace>>\
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	<br><br>
 	In a cold tone of voice, you admit your irritation with this schoolgirl nonsense, and tell her she's to stop spending time with $subSlave.slaveName. She's unable to prevent her eyes from flicking up at you in @@.mediumorchid;shock and horror,@@ but she instantly lowers them again, the tears coming fast. You dismiss her, and she turns to go, but is so discombobulated by anguish that she trips over her own feet and falls with a slap of naked $activeSlave.skin flesh against the floor. Their relationship @@.lightsalmon;is over.@@
@@ -42,9 +40,7 @@ She nods her head quickly, still staring at her feet. She shuts her eyes tight a
 	<</replace>>
 <</link>>
 <br><<link "Build her confidence">>
-	<<replace "#name">>\
-	$activeSlave.slaveName\
-	<</replace>>\
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	<br><br>
 	In a warm tone of voice, you tell her you approve of her relationship with $subSlave.slaveName. She raises her chin and looks at you with @@.hotpink;growing adoration@@ as you point out how lucky $subSlave.slaveName is to have her. You tell her that you're not planning to intervene personally, but that you think she really ought to pursue the relationship, that they're good for each other, and that you're confident $subSlave.slaveName feels the same way. She thanks you prettily and leaves at a flat run, in a hurry to tell her
@@ -70,9 +66,7 @@ She nods her head quickly, still staring at her feet. She shuts her eyes tight a
 	<</replace>>
 <</link>>
 <br><<link "Bring the other girl in">>
-	<<replace "#name">>\
-	$activeSlave.slaveName\
-	<</replace>>\
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	<br><br>
 	You tell $activeSlave.slaveName to wait, and page $subSlave.slaveName up to your office. $activeSlave.slaveName looks terrified, but tries to conceal her emotions behind a happy greeting for her
diff --git a/src/uncategorized/reStandardPunishment.tw b/src/uncategorized/reStandardPunishment.tw
index 8235cc042645597f05b25447939c212f65c7ff9e..7e625f7dbff7ef0b6ed6630c402bd08113449988 100644
--- a/src/uncategorized/reStandardPunishment.tw
+++ b/src/uncategorized/reStandardPunishment.tw
@@ -78,7 +78,7 @@
 <<case "confinement">>
 
 <<link "Confine her firmly but fairly">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	Since you use confinement as a standard slave punishment, <<if $cellblock != 0>>in addition to $cellblockName, <</if>>you have little cubicles designed for the purpose scattered around the penthouse. You order $activeSlave.slaveName into one of these. She obeys,
 	<<if $activeSlave.devotion > 20>>
@@ -93,7 +93,7 @@
 	<</replace>>
 <</link>>
 <br><<link "Confine her cruelly">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	Since you use confinement as a standard slave punishment, <<if $cellblock != 0>>in addition to $cellblockName, <</if>>you have several boxes designed for the purpose in convenient areas. You order $activeSlave.slaveName to your office, and direct a box to be brought there. She begins to cry when she sees it,
 	<<if $activeSlave.devotion > 20>>
@@ -112,7 +112,7 @@
 <<case "whipping">>
 
 <<link "Give her a solid whipping">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	Since you use whipping as a standard slave punishment, there are many sets of restraints set high up on the walls for the purpose. You order her to place her hands in one of them, and she
 	<<if $activeSlave.devotion > 20>>
@@ -127,7 +127,7 @@
 	<</replace>>
 <</link>>
 <br><<link "Confine her cruelly">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	Since you use whipping as a standard slave punishment, there are many sets of restraints set high up on the walls for the purpose. You order her to place her hands in one of them, and she
 	<<if $activeSlave.devotion > 20>>
@@ -145,7 +145,7 @@
 <<case "chastity">>
 
 <<link "Restrain her in your office">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	Since you use chastity as a punishment, you're accustomed to using your office for supervising sexual denial. You bring her up and restrain her standing, hands over her head in one of the sets of shackles set high on the walls, facing out so she can see everything that goes on in your office. You gag her securely, <<if $activeSlave.voice == 0>>despite her muteness, a sad mockery<<else>>not wanting your work disturbed by unseemly noises<</if>>. Then you ignore her. Business as usual in your office is profoundly sexual.
 	<<if $activeSlave.energy > 60>>
@@ -176,7 +176,7 @@
 	<</replace>>
 <</link>>
 <br><<link "Torment her with vibration">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	Since you use chastity as a punishment, you're accustomed to using your office for supervising sexual denial. You order her to place her hands in one of the many sets of restraints set high up on the office walls for the purpose.
 	<<if $activeSlave.clitPiercing != 3>>
@@ -201,7 +201,7 @@
 <<case "anal reluctance">>
 
 <<link "Punish her ass">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	Deciding that the most appropriate punishment is some corrective assrape, you shove the slave to her knees and stuff <<if $PC.dick == 1>>your cock<<else>>a formidable dildo<</if>> up her
 	<<if $activeSlave.anus > 2>>
@@ -222,7 +222,7 @@
 <<case "vaginal reluctance">>
 
 <<link "Punish her pussy">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	Deciding that the most appropriate punishment is some corrective rape, you push the slave down on her back and shove <<if $PC.dick == 1>>your cock<<else>>a formidable dildo<</if>> inside her
 	<<if $activeSlave.anus > 2>>
@@ -243,7 +243,7 @@
 <<case "chatting">>
 
 <<link "Put her mouth to better use">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You announce that she'll have less trouble gossiping instead of being prompt if her mouth is nice and tired. Comprehension and apprehension dawn on her face in the moment before you <<if $activeSlave.collar != "none">>grab her by the collar and pull<<else>>put a hand on her shoulder and shove<</if>> her to the ground. She goes down without resistance, <<if $PC.dick == 1>>already opening wide for your stiff prick.<<else>>her look of unconcern vanishing when she sees you pulling out a strap-on. She doesn't get to eat pussy today; today she gets fucked in the face.<</if>> You shove it down her
 	<<if $activeSlave.sexualQuirk == "gagfuck queen">>
@@ -264,7 +264,7 @@
 <<case "dawdling">>
 
 <<link "Make her run">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You tell her that she clearly needs practice being prompt. Your tone is conversational, but she doesn't mistake it for kindness. It's the tone you use with slaves when imparting guidance which is to be accepted and followed on pain of terrible punishment. You make her explain where she was and what she was doing previously, and require her to walk you there. She does, <<if $activeSlave.trust > 20>>trustingly<<elseif $activeSlave.trust >= -20>>rather fearfully<<else>>shaking with fear<</if>>, and when you get there you tell her to run to her next task. She hesitates for an instant, until you <<if $PC.title == 1>>bellow<<else>>shriek<</if>> at her to run! She takes off,
 	<<if $activeSlave.shoes == "extreme heels">>
@@ -298,7 +298,7 @@
 <<case "slave refusal">>
 
 <<link "Make sure she knows she's for use">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	Deciding to ensure the $desc really understands that she's a sex slave and can be used by anyone, even other slaves, you order her to put her mouth to work on the slave who demanded sex from her.
 	<<set $activeSlave.oralCount += 1>>
@@ -326,7 +326,7 @@
 <<case "slave molestation">>
 
 <<link "Make her apologize and then dominate her">>
-	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	You order the horny $desc to apologize to the slave she grabbed, which she does, <<if canTalk($activeSlave)>>managing to sound authentically sorry<<else>>gesturing her regret with apparent sincerity<</if>>. It seems she might feel some actual guilt at molesting a fellow slave, but she's about to feel much sorrier. Once the other slave has been dismissed, you grab her by the neck and
 	<<if canDoVaginal($activeSlave) && ($activeSlave.vagina != 0)>>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 229d621da535acf5c133478f2d2ed64a46e8f161..e32eaacc8f8dd578a159487eff4c0e19fe4214b4 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -135,7 +135,7 @@
 <<if $arcologies[0].ownership >= $arcologies[0].minority>>
 	<<if $arcologies[0].ownership >= $arcologies[0].minority+5>>
 		<<if $arcologies[0].ownership < 100>>
-			<<if $assistantPower >= 1>> (@@.yellowgreen;<<print $arcologies[0].ownership>>%@@:<<print $arcologies[0].minority>>%) <<else>> (@@.yellowgreen;<<print $arcologies[0].ownership>>%) <</if>>
+			<<if $assistantPower >= 1>> (@@.yellowgreen;<<print $arcologies[0].ownership>>%@@:<<print $arcologies[0].minority>>%) <<else>> (@@.yellowgreen;<<print $arcologies[0].ownership>>%@@) <</if>>
 		<<else>> (<<print $arcologies[0].ownership>>%)
 		<</if>>
 	<<else>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index cb2b206b55dd48c1fd0b6d20d5b85f1fdb33699b..b286804204bafb8442e764a88cbca5f7ad8e569f 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -114,7 +114,7 @@
 		<<if ($limbs[_dwj] != 0) && ($limbs[_dwj].ID == _Slave.ID)>>
 			<<set _validHost = 1>>
 			<<if ($limbs[_dwj].weeksToCompletion <= 0)>>
-				<br>@@.yellow;The facility has completed a set of limbs for@@ <span id="name"><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves[" + _dwi + "]]]">></span>, @@.yellow; which is ready to be attached.@@
+				<br>@@.yellow;The facility has completed a set of limbs for@@ <span id="name"><<print "[[SlaveFullName(_Slave)|Slave Interact][$activeSlave = $slaves[" + _dwi + "]]]">></span>, @@.yellow; which is ready to be attached.@@
 			<</if>>
 		<</if>>
 	<</for>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 566c231c0d5cfb1984620a27e27d540f27ff18f5..403fca721d3975de2bc5e31a9457ee427a36b7a1 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -1029,7 +1029,7 @@ This experience
  Call as <<EventNameLink>>
  $args[0]: Slave.
 */
-<<widget "EventNameLink">><<if $surnameOrder != 1>><<switch $args[0].nationality>><<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">><<if $args[0].slaveSurname>><<set _nameLink = $args[0].slaveSurname>><<set _nameLink += " " + $args[0].slaveName>><<else>><<set _nameLink = $args[0].slaveName>><</if>><<default>><<set _nameLink = $args[0].slaveName>><<if $args[0].slaveSurname>><<set _nameLink += " " + $args[0].slaveSurname>><</if>><</switch>><<else>><<set _nameLink = $args[0].slaveName>><<if $args[0].slaveSurname>><<set _nameLink += " " + $args[0].slaveSurname>><</if>><</if>><span id="name"><<print "[[_nameLink|Long Slave Description][$nextLink = passage(), $eventDescription = 1]]">></span><</widget>>
+<<widget "EventNameLink">><span id="name"><<print "[[SlaveFullName($args[0])|Long Slave Description][$nextLink = passage(), $eventDescription = 1]]">></span><</widget>>
 
 /*
  Call as <<EventNameDelink>>