diff --git a/src/uncategorized/familyPanic.tw b/src/npc/familyPanic.tw
similarity index 100%
rename from src/uncategorized/familyPanic.tw
rename to src/npc/familyPanic.tw
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index 73a714b51025baf34bfba7c8195c1dcce9599142..41b48409e62197f60662e269522ecd4d7b3baa70 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -12,27 +12,6 @@
 	<br><br>
 <</if>>
 
-<<if ndef $defaultRules>>
-	<<include "Init Rules">>
-<</if>>
-<<if ndef $prostateImplants>>
-	<<set $prostateImplants = 0>>
-<</if>>
-<<if ndef $aphrodisiacUpgradeRefine>>
-	<<set $aphrodisiacUpgradeRefine = 0>>
-<</if>>
-<<if ndef $dietCleanse>>
-	<<set $dietCleanse = 0>>
-<</if>>
-<<if ndef $PC.birthSelf>>
-	<<set $PC.birthSelf = 0>>
-<</if>>
-<<if ndef $PC.balls>>
-	<<set $PC.balls = 0>>
-<</if>>
-<<if ndef $universalRulesImmobileSlavesMaintainMuscles>>
-	<<set $universalRulesImmobileSlavesMaintainMuscles = 0>>
-<</if>>
 <<set $currentRule = $defaultRules[0]>>
 
 <<SlaveSort $slaves>>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index 41cc7184cdc00ba8ab9b6b5f66af1541250760a0..692651149cc7926e377f979a8cefa3bcd22e2714 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -29,6 +29,7 @@
 	<<if $personalAttention == _Slave.ID>>''@@.lightcoral;PA@@''<</if>>
 	<<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
 <<case "Personal Attention Select">>
+	<<if (_Slave.assignmentVisible != 1) || (_Slave.fuckdoll > 0)>><<continue>><</if>>
 	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
 	<<print "[[_slaveName|Personal Attention Select][$personalAttention = $slaves["+_ssi+"].ID, $activeSlave = $slaves["+_ssi+"], $personalAttentionChanged = 1]]">>
 <<case "Agent Select">>