diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 41420236c870ea923d2de0353816c41d19dfd80c..c36ec352dd42b0ccffeed57941b773a66b455f2d 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -2552,7 +2552,7 @@ __I do not give credit without explicit permission to do so.__ If you have contr
 <br>''anon'' for considerable bugfixing, most notably that infernal reputation bug.
 <br>''anon'' added a pair of fairy PA appearances.
 <br>''anon'' for their clitoral surgery, SMRs, and hip changes.
-<br>''anon'' for the Scotts, Belarus, Dominicans, gilfwork and additional nicknames.
+<br>''DarkTalon25'' for the Scotts, Belarus, Dominicans, gilfwork, additional nicknames and a scalemail bikini.
 <br>''anon'' for FAbuse alterations, gang leader start, and scarring.
 <br>''anon'' for numerous pointed out typos.
 <br>''anon'' for grorious nihon starting rocation.
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index 926523e3717dbbb8f5700981b2fda37a675b9641..755ce0d0c31a90c1ad6edcb037e6e825b5a077f9 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -953,6 +953,7 @@
 <</if>>
 <</if>>
 <</if>>
+<</if>>
 
 <<if $eventSlave.trust > 20>>
 <<if $eventSlave.devotion > 20>>
@@ -1425,6 +1426,7 @@
 	<<set $RESSevent.push("nice guys")>>
 <</if>>
 <</if>>
+<</if>>
 
 <<if $eventSlave.assignment == "please you">>
 <<if $eventSlave.devotion > 20>>
diff --git a/src/uncategorized/rulesAssistant.tw b/src/uncategorized/rulesAssistant.tw
index 2a46f4f0a0a71d74e3a661015ac6dce392415e12..55b6268a66544a808bb244ffc2a75663f83e15fe 100644
--- a/src/uncategorized/rulesAssistant.tw
+++ b/src/uncategorized/rulesAssistant.tw
@@ -531,6 +531,12 @@ Clothes:
 	<<RARuleModified>>
 <</link>>
 |
+<<link "Scalemail bikini">>
+	<<set $currentRule.clothes = "a scalemail bikini">>
+	<<RAChangeClothes>>
+	<<RARuleModified>>
+<</link>>
+|
 <<link "Succubus costume">>
 	<<set $currentRule.clothes = "a succubus outfit">>
 	<<RAChangeClothes>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 77461b287d6d3164f4f9fcae137c13d41468ebf5..4aa835b8da95f5c471dd6dbf81aff847842410fb 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -2786,34 +2786,13 @@ This experience
  Call as <<EventNameLink>>
  $args[0]: Slave.
 */
-<<widget "EventNameLink">>
-	<<switch $args[0].nationality>>
-	<<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
-		<<if $args[0].slaveSurname>><<set _name = $args[0].slaveSurname>><<set _name += " " + $args[0].slaveName>><<else>><<set _name = $args[0].slaveName>><</if>>
-	<<default>>
-		<<set _name = $args[0].slaveName>>
-		<<if $args[0].slaveSurname>><<set _name += " " + $args[0].slaveSurname>><</if>>
-	<</switch>>
-	/*
-	<<switch $activeSlave.nationality>>
-	<<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
-		<<if $args[0].slaveSurname>><<set _name = $args[0].slaveSurname + " " + $args[0].slaveName>><</if>>
-	<<default>>
-		<<if $args[0].slaveSurname>><<set _name = $args[0].slaveName + " " + $args[0].slaveSurname>><</if>>
-	<</switch>>
-	*/
-	<span id="name"><<print "[[_name|Long Slave Description][$nextLink = passage(), $eventDescription = 1]]">></span>
-<</widget>>
+<<widget "EventNameLink">><<switch $args[0].nationality>><<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">><<if $args[0].slaveSurname>><<set _name = $args[0].slaveSurname>><<set _name += " " + $args[0].slaveName>><<else>><<set _name = $args[0].slaveName>><</if>><<default>><<set _name = $args[0].slaveName>><<if $args[0].slaveSurname>><<set _name += " " + $args[0].slaveSurname>><</if>><</switch>><span id="name"><<print "[[_name|Long Slave Description][$nextLink = passage(), $eventDescription = 1]]">></span><</widget>>
 
 /*
  Call as <<EventNameDelink>>
  $args[0]: Slave.
 */
-<<widget "EventNameDelink">>
-	<<replace "#name">>
-		<<SlaveFullName $args[0]>>
-	<</replace>>
-<</widget>>
+<<widget "EventNameDelink">><<replace "#name">><<SlaveFullName $args[0]>><</replace>><</widget>>
 
 /*
  Call as <<DegradingName $slave>> where $slave is any slave object