diff --git a/.gitignore b/.gitignore
index 03e41c26df58ae42f32adb09b9513ccd77073e21..53be0e9f2203e7f3232ef8cdb054cdb46d43ca2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -105,4 +105,5 @@ TODO.txt
 # outlines
 *.outline
 
+# misc
 fc-pregmod
diff --git a/TODO.txt b/TODO.txt
index 11e7b38d87b0610590999b14a88831fc69513995..3730a5285ae5962f5a753075c5af984f828ecf1a 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -50,6 +50,7 @@ X create Nursery
 - hardcap of 50 (40?)
 - add option to kick out babies if space is needed
 - rewrite certain areas
+- allow the Matron to fix nannies' flaws
 
 Misc
 - rework seNonlethalPit.tw to take different variables into account (virginity, devotion / trust, fetishes / quirks, etc)
diff --git a/src/facilities/nursery/nurseryReport.tw b/src/facilities/nursery/nurseryReport.tw
index 129245305d739cf86f62b99eb89e9f68c8f318f2..1a026f886b21a29fde2341a98687b3991bb93432 100644
--- a/src/facilities/nursery/nurseryReport.tw
+++ b/src/facilities/nursery/nurseryReport.tw
@@ -1,7 +1,7 @@
 :: Nursery Report [nobr]
 
 //Currently WIP//
-/* This will need to be rewritten 
+
 <<SlaveSort $NurseryiIDs>>
 <<set _DL = $NurseryiIDs.length, $nurserySlaves = _DL, _SL = $slaves.length, _bonusToggle = 0, _healthBonus = 0, _idleBonus = 0, _restedSlaves = 0, _trustBonus = 0>>
 
@@ -28,9 +28,9 @@
 	<</if>>
 	<<set _FLsFetish = 0>>
 	<<if $slaves[_FLs].fetishStrength <= 95>>
-		<<if $slaves[_FLs].fetish != "submissive">>
+		<<if $slaves[_FLs].fetish != "caring">>
 			<<if fetishChangeChance($slaves[_FLs]) > random(0,100)>>
-				<<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "submissive">>
+				<<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "caring">>
 			<</if>>
 		<<elseif $slaves[_FLs].fetishKnown == 0>>
 			<<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1>>
@@ -38,15 +38,15 @@
 			<<set _FLsFetish = 2, $slaves[_FLs].fetishStrength += 4>>
 		<</if>>
 	<</if>>
-	<<if ($Matron.fetish == "none") || ($Matron.fetish == "submissive")>>
+	<<if ($Matron.fetish == "none") || ($Matron.fetish == "caring")>>
 		<<set _devBonus++>>
 	<</if>>
 	<<set $slaves[_FLs].devotion += _devBonus, $Matron = $slaves[_FLs]>>
 	&nbsp;&nbsp;&nbsp;&nbsp;<<= SlaveFullName($Matron)>> is serving as the nursery matron.<<if $Matron.relationship == -3 && $Matron.devotion > 50>> She tries her best to be your perfect attentive, caring and loving wife.<</if>>
 	<<if (_FLsFetish == 1)>>
-		When she is paid a visit by a slave with sexual issues to work out, she provides her with an understanding, willing, giving partner. She finds real satisfaction in helping your slaves find sexual gratification, and @@.lightsalmon;becomes a submissive.@@
+		When she is paid a visit by a slave with sexual issues to work out, she provides her with an understanding, willing, giving partner. She finds real satisfaction in helping your slaves find sexual gratification, and @@.lightsalmon;becomes a caring.@@
 	<<elseif (_FLsFetish == 2)>>
-		Every new slave in the nursery is a new girl she gets to connect with and serve. Sexually. @@.lightsalmon;She becomes more submissive.@@
+		Every new slave in the nursery is a new girl she gets to connect with and serve. Sexually. @@.lightsalmon;She becomes more caring.@@
 	<</if>>
 	<<if setup.attendantCareers.includes($Matron.career)>>
 		She has experience with counseling from her life before she was a slave, making her better at building a rapport with troubled slaves, and giving her a better chance of softening flaws into beneficial quirks.
@@ -64,7 +64,7 @@
 	<<if ($Matron.fetish == "none")>>
 		$Matron.slaveName respects the slaves lounging in the nursery, allowing them to relax completely.
 		<<set _idleBonus++>>
-	<<elseif ($Matron.fetish == "submissive")>>
+	<<elseif ($Matron.fetish == "caring")>>
 		$Matron.slaveName lets the slaves resting in the nursery take the lead sexually, doing her best to please them.
 		<<set _idleBonus++>>
 	<<elseif ($Matron.fetishKnown == 1)>>
@@ -231,16 +231,16 @@
 <</if>>
 
 <<if $Matron != 0>>
-	<<set $i = _FLs>> /* apply following SA passages to facility leader *//*
+	<<set $i = _FLs>> /* apply following SA passages to facility leader */
 	<<if $showEWD != 0>>
 		<br><br>
-		/* 000-250-006 *//*
+		/* 000-250-006 */
 		<<if $seeImages && $seeReportImages>>
 		<div class="imageRef smlImg">
 			<<SlaveArt $slaves[_FLs] 0 0>>
 		</div>
 		<</if>>
-		/* 000-250-006 *//*
+		/* 000-250-006 */
 		''__@@.pink;<<= SlaveFullName($slaves[$i])>>@@__'' is serving as the Matron in $nurseryName.
 		<br>&nbsp;&nbsp;&nbsp;
 		<<= saChoosesOwnClothes($slaves[$i])>>
@@ -295,13 +295,13 @@
 	<</if>>
 	<<if $showEWD != 0>>
 		<br><br>
-		/* 000-250-006 *//*
+		/* 000-250-006 */
 		<<if $seeImages && $seeReportImages>>
 		<div class="imageRef smlImg">
 			<<SlaveArt $slaves[$i] 0 0>>
 		</div>
 		<</if>>
-		/* 000-250-006 *//*
+		/* 000-250-006 */
 		''__@@.pink;<<= SlaveFullName($slaves[$i])>>@@__''
 		<<if $slaves[$i].choosesOwnAssignment == 2>>
 			<<include "SA chooses own job">>
diff --git a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterOrder.tw b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterOrder.tw
index e6091cc3c12e0815cb6bc97a8b2738f901499267..bcbf6039013c7263f7d7b850ffb45e233f19a817 100644
--- a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterOrder.tw
+++ b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterOrder.tw
@@ -30,7 +30,6 @@
 				<br>[[Matron|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Matron"]]
 				<br>[[Stewardess|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Stewardess"]]
 				<br>[[Milkmaid|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Milkmaid"]]
-				<br>[[Matron|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Matron"]]
 				<br>[[Return|JobFulfillmentCenterOrder]]
 		<</replace>>
 		<</link>>
diff --git a/src/pregmod/widgets/assignmentFilterWidget.tw b/src/pregmod/widgets/assignmentFilterWidget.tw
index a03b01e87c0264b5c636d97604d2cd885a9f17c9..6ab787586c57fb6837b5a93523c4bea227993201 100644
--- a/src/pregmod/widgets/assignmentFilterWidget.tw
+++ b/src/pregmod/widgets/assignmentFilterWidget.tw
@@ -94,8 +94,6 @@
 	<<if passage() != "Nursery">><<print " | ">><<link Nursery>><<nurseryAssignmentFilter>><<replace #ComingGoing>><<set $Flag = 0>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
 	<<if passage() != "Master Suite">><<print " | ">><<link Suite>><<suiteAssignmentFilter>><<replace #ComingGoing>><<set $Flag = 0>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
 	<<if passage() != "Servants' Quarters">><<print " | ">><<link Quarters>><<quartersAssignmentFilter>><<set $Flag = 0>><<replace #ComingGoing>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
-	<<if passage() != "Nursery">><<print " | ">><<link Nursery>><<quartersAssignmentFilter>><<set $Flag = 0>><<replace #ComingGoing>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
-	<<resetAssignmentFilter>>
 <</widget>>
 
 /*
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index a2342655dfda44959361b196de542d51f5b01c12..1be41656c5e9e72cbbefa2d46734e8487e31e114 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -831,23 +831,23 @@ All in all,
 		After sending $his reserved child<<if _cToIncub > 1>>ren<</if>> to $incubatorName, it's time to decide the fate of the other<<if _curBabies > 0>><</if>>.
 	<</if>>
 <</if>>
+/*
+/* ----------------------- nursery adding subsection. Basically copied and pasted from the above section.
 
-/* ----------------------- nursery adding subsection. Basically copied and pasted from the above section. */
-
-/*I don't actually know what most of these variables do and I'm too lazy to look so if something break I'm sorry and tell me and I'll fix it - DCoded*/
+/*I don't actually know what most of these variables do and I'm too lazy to look so if something break I'm sorry and tell me and I'll fix it - DCoded
 <<set _curBabies = $slaves[$i].curBabies.length, _cToNursery = 0, _origReserve = $slaves[$i].reservedChildrenNursery>> 
 
 <<if _origReserve > 0 && _curBabies > 0>>
 	<<if _curBabies >= _origReserve>>
-		/*adding normal*/
+		/*adding normal
 		<<set $reservedChildrenNursery -= _origReserve>>
 		<<set _cToNursery = _origReserve, $slaves[$i].reservedChildrenNursery = 0>>
 	<<elseif _curBabies < _origReserve && $slaves[$i].womb.length > 0>>
-		/*broodmother or partial birth, we will wait for next time to get remaining children*/
+		/*broodmother or partial birth, we will wait for next time to get remaining children
 		<<set $slaves[$i].reservedChildrenNursery -= _curBabies, _cToNursery = _curBabies>>
 		<<set $reservedChildrenNursery -= _curBabies>>
 	<<else>>
-		/*Stillbirth or something other go wrong. Correcting children count.*/
+		/*Stillbirth or something other go wrong. Correcting children count.
 		<<set $reservedChildrenNursery -= _origReserve>>
 		<<set $slaves[$i].reservedChildrenNursery = 0, _cToNursery = _curBabies>>
 	<</if>>
@@ -861,7 +861,7 @@ All in all,
 	<</if>>
 	<<for _k = 0; _k < _cToNursery; _k++>> 
 		<<if _identicalChildGen == 0>>
-			<<if _k == $slaves[$i].curBabies.length-1 && $slaves[$i].curBabies.length > 1 && $slaves[$i].curBabies[_k].identical == 1>> /* catch for improperly placed identical twin flag to still generate*/
+			<<if _k == $slaves[$i].curBabies.length-1 && $slaves[$i].curBabies.length > 1 && $slaves[$i].curBabies[_k].identical == 1>> /* catch for improperly placed identical twin flag to still generate
 				<<set _twin = clone($activeSlave)>>
 				<<set _twin.ID = $IDNumber++>>
 				<<set $activeSlave = 0>>
@@ -885,7 +885,7 @@ All in all,
 	<</for>>
 	<<if _shiftDegree > 0>>
 		<<for _sbw = 0; _sbw < _shiftDegree; _sbw++>>
-			/* For now, children only get full slave objects when they enter the incubator, and nothing from their unborn self is retianed, so that's discarded here. Later we might transfer some data instead. */
+			/* For now, children only get full slave objects when they enter the incubator, and nothing from their unborn self is retianed, so that's discarded here. Later we might transfer some data instead. 
 			<<set $slaves[$i].curBabies.shift()>>
 		<</for>>
 	<</if>>
@@ -895,7 +895,7 @@ All in all,
 		After sending $his reserved child<<if _cToNursery > 1>>ren<</if>> to $incubatorName, it's time to decide the fate of the other<<if _curBabies > 0>><</if>>.
 	<</if>>
 <</if>>
-
+*/
 /*------------------------ Fate of other babies ---------------------------------------*/
 
 <<if $slaves[$i].fetish != "mindbroken" && $slaves[$i].fuckdoll == 0 && _curBabies > 0>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 0da49c8a1e05643409784277e495929473fea478..a6f1566b1ac0b8a50c12638d9a8d35e335a18366 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -18124,7 +18124,7 @@ You tell her kindly that you understand, and that $he'll be trained to address t
 		<<case "please you">>(the wardrobe, where $he'll get dressed before attending to you for the rest of the day),
 		<<case "be a subordinate slave">>(the living area of the slave $he's been assigned to serve),
 		<<case "be a servant">>(the closet that contains the cleaning items $he'll use to dust and polish the penthouse today),
-		<<case "be a nanny">>($nurseryName, where $he is taking care of infants),
+		<<case "be a nanny">>($nurseryName, where $he is tending to the children),
 		<<case "stay confined">>(her cell),
 		<<case "guard you">>(the armory where her weapons are kept),
 		<<case "be your Head Girl">>(the assignment location of a slave who needs some hands-on guidance from your Head Girl),
@@ -18139,7 +18139,7 @@ You tell her kindly that you understand, and that $he'll be trained to address t
 		<<case "be the Wardeness">>($cellblockName, to oversee the inmates),
 		<<case "be your Concubine">>(your bed),
 		<<case "be the Nurse">>($clinicName, to check on the patients),
-		<<case "be the Matron">>($nurseryName, where $he is managing babies and nannies),
+		<<case "be the Matron">>($nurseryName, where $he is managing children and nannies),
 		<<case "live with your Head Girl">>
 		<<default>>(a waiting area for further assignment),
 		<</switch>>
diff --git a/src/uncategorized/seLethalPit.tw b/src/uncategorized/seLethalPit.tw
index fa794880f87d498841dbb20ec213c4542db084c8..bde6d707c6b022a8ae1bc3acb6c7db5e010b68a0 100644
--- a/src/uncategorized/seLethalPit.tw
+++ b/src/uncategorized/seLethalPit.tw
@@ -651,7 +651,7 @@ In any case, <<if $pitAnimal == 0>>both of the slaves have<<else>>the slave and
 			<<set _winner.health -= 80>>
 			<<if $pitAudience == "paid">>
 				The audience is awestruck by the blind girl's triumph, and your @@.yellowgreen;cut of the betting@@ is enormous.
-				<<set $cash += 40000>>
+				<<set $cash += 50000>>
 			<<elseif $pitAudience == "free">>
 				The audience is @@.green;awestruck@@ by the blind girl's triumph.
 				<<set $rep += 2000>>
diff --git a/src/uncategorized/seNonlethalPit.tw b/src/uncategorized/seNonlethalPit.tw
index 721fc0a6bfb308a9876d9f9ccd82f916f2edd633..a2392a2ed6f68eb812b7d2fae776cdc947aef55c 100644
--- a/src/uncategorized/seNonlethalPit.tw
+++ b/src/uncategorized/seNonlethalPit.tw
@@ -1019,7 +1019,7 @@
 		<<set _orifice = "asshole">>
 	<<else>>
 		<<set _sexAct = "oral">>
-		<<set _orifice = "mouth">>
+		<<set _orifice = "mouth">>	/*this shouldn't ever actually be used*/
 	<</if>>
 
 	<<if ($activeSlave.muscles > -30) && ($activeSlave.weight <= 95) && ($activeSlave.health >= -50) && ($activeSlave.bellyPreg <= 5000) && ($activeSlave.bellyImplant <= 4000) && ($activeSlave.labor == 0) && ($activeSlave.bellyFluid <= 2000)>>
@@ -1076,7 +1076,7 @@
 			The audience is @@.green;not very impressed@@ by this mediocre display.
 			<<set $rep += 25>>
 		<</if>>
-		It <<if _animal.type != "hooved">>swipes at $his legs<<else>>headbutts $him<</if>>, causing $him to go down hard. It doesn't waste a moment, and mounts $him quicker than you thought would have been possible for a _animal.species. It takes a few tries, but it finally manages to find $his _orifice, causing <<if $audience != "none">>the crowd to go wild and<</if>> $activeSlave.slaveName to give a long, drawn-out <<if _agree == 1>>moan<<else>>scream<</if>> as its _animal.dickSize fills $his _orifice. Without hesitation, it begins to steadily thrust, pounding $him harder and harder as it grows closer and closer to climax. After several minutes, you see the animal finally stop thrusting as the barely-there slave gives a loud <<if _agree == 1>>moan<<else>>groan<</if>>. <<if $audience != "none">>The crowd gives a loud cheer as the<<else>>The<</if>> animal pulls, leaving the thouroughly fucked-out $activeSlave.slaveName lying there, cum streaming out of $his _orifice.
+		It <<if _animal.type != "hooved">>swipes at $his legs<<else>>headbutts $him<</if>>, causing $him to go down hard. It doesn't waste a moment, and mounts $him quicker than you thought would have been possible for a _animal.species. It takes a few tries, but it finally manages to find $his _orifice, causing <<if $audience != "none">>the crowd to go wild and<</if>> $activeSlave.slaveName to give a long, drawn-out <<if _agree == 1>>moan<<else>>scream<</if>> as its _animal.dickSize fills $his _orifice. Without hesitation, it begins to steadily thrust, pounding $him harder and harder as it grows closer and closer to climax. After several minutes, you see the animal finally stop thrusting as the barely-there slave gives a loud <<if _agree == 1>>moan<<else>>groan<</if>>. <<if $audience != "none">>The crowd gives a loud cheer as the<<else>>The<</if>> animal pulls out, leaving the thouroughly fucked-out $activeSlave.slaveName lying there, cum streaming out of $his _orifice.
 	<</if>>
 	<<set $slaves[$slaveIndices[_fighterOne.ID]] = _fighterOne>>
 	<<set $fighterIDs.push(_fighterOne.ID)>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 1591f2fa87ae786886cb15d90d474f8b8b9668c4..4bedc96ca4575489307210ba3171134760c23ef8 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1234,7 +1234,7 @@ Aphrodisiacs: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1
 <</if>>
 <</if>>
 <</if>>
-
+/*
 <<if $nursery > 0>>
 <<if $activeSlave.preg > 0 && $activeSlave.broodmother == 0 && $activeSlave.pregKnown == 1 && $activeSlave.eggType == "human">>
 <<if $activeSlave.assignment == "work in the dairy" && $dairyPregSetting > 0>>
@@ -1285,7 +1285,7 @@ Aphrodisiacs: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1
 <</if>>
 <</if>>
 <</if>>
-
+*/
 <<if $propOutcome == 1 && $arcologies[0].FSRestart != "unset">>
 	<<if $activeSlave.breedingMark == 0 && $activeSlave.fuckdoll == 0 && $activeSlave.eggType == "human" && isFertile($activeSlave)>>
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index c9174d9d3804d46a8ec1ed9c406fab1b499f17c2..69cd84662f0d9f2563c1b8eca30dd075091dd67e 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -279,6 +279,26 @@
 <<case "Attendant Select">>
 	<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>>
 	[[_slaveName|Attendant Workaround][$i = _ssi]]
+<<case "Nursery">>
+<<if $Flag == 0>>
+	<<if $nursery <= $nurserySlaves>><<continue>><</if>>
+	<<if (_Slave.devotion >= -20) || ((_Slave.devotion >= -50) && (_Slave.trust <= 20)) || (_Slave.trust < -20)>>
+		<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>>
+		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
+	<<else>>
+		<br>//_Slave.slaveName must be either more fearful of you or devoted to you//
+		<<continue>>
+	<</if>>
+<<elseif $Flag == 1>>
+		<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>>
+		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
+<<else>>
+		<<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
+<</if>>
+<<case "Matron Select">>
+	<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>>
+	[[_slaveName|Matron Workaround][$i = _ssi]]
 <<case "Brothel">>
 <<if $Flag == 0>>
 	<<if $brothel <= $brothelSlaves>><<continue>><</if>>
@@ -489,26 +509,6 @@
 <<case "Wardeness Select">>
 	<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>>
 	[[_slaveName|Wardeness Workaround][$i = _ssi]]
-<<case "Nursery">>
-<<if $Flag == 0>>
-	<<if $nursery <= $nurserySlaves>><<continue>><</if>>
-	<<if (_Slave.devotion >= -20) || ((_Slave.devotion >= -50) && (_Slave.trust <= 20)) || (_Slave.trust < -20)>>
-		<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>>
-		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
-	<<else>>
-		<br>//_Slave.slaveName must be either more fearful of you or devoted to you//
-		<<continue>>
-	<</if>>
-<<elseif $Flag == 1>>
-		<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>>
-		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
-<<else>>
-		<<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
-<</if>>
-<<case "Matron Select">>
-	<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>>
-	[[_slaveName|Matron Workaround][$i = _ssi]]
 <<case "Arcade">>
 <<if $Flag == 0>>
 	<<if _Slave.assignment == "be confined in the arcade">><<continue>><</if>>
@@ -819,7 +819,7 @@ will
 		<<break>>
 	<</if>>
 <<case "Matron Select">>
-	<<if setup.attendantCareers.includes(_Slave.career) || (_Slave.skillMT >= $masteredXP)>>
+	<<if setup.matronCareers.includes(_Slave.career) || (_Slave.skillMT >= $masteredXP)>>
 		<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@.lime;Has applicable career experience.@@
 	<</if>>
 <<case "Brothel">>
@@ -940,20 +940,6 @@ will
 	<<if setup.wardenessCareers.includes(_Slave.career) || (_Slave.skillWA >= $masteredXP)>>
 		<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@.lime;Has applicable career experience.@@
 	<</if>>
-<<case "Nursery">>
-	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
-	<<if $Flag == 0>>
-		[[Send her to the Nursery|Assign][$i = _ssi]]
-	<<elseif $Flag == 1>>
-		[[Remove her from the Nursery|Retrieve][$i = _ssi]]
-	<<else>>
-		[[Change or remove Matron|Matron Select]]
-		<<break>>
-	<</if>>
-<<case "Matron Select">>
-	<<if setup.matronCareers.includes(_Slave.career) || (_Slave.skillMT >= $masteredXP)>>
-		<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@.lime;Has applicable career experience.@@
-	<</if>>
 <<case "New Game Plus">>
 	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
 	<<if $Flag === 0>>