diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index 5e22e9ebdc5521e8d45cbdd04e3cb78578dd542a..619033f1c01de75a9ee0ddeb10582cd8458a5de5 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -227,7 +227,7 @@ Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $
 			<<else>>
 				All $slaves[_u].reservedChildrenNursery of her children will be placed in $nurseryName.
 			<</if>>
-			<<if ($slaves[_u].reservedChildrenNursery < $slaves[_u].pregType) && ($reservedChildrenNursery < $freeCribs) && ($slaves[_u].reservedChildrenNursery - $slaves[_u].reservedChildren > 0)>>
+			<<if ($slaves[_u].reservedChildren + $slaves[_u].reservedChildrenNursery < $slaves[_u].pregType)  && ($reservedChildrenNursery < $freeTanks)>>
 				<br>&nbsp;&nbsp;&nbsp;&nbsp;
 				<<print "[[Keep another child|Nursery][$slaves[" + _u + "].reservedChildrenNursery += 1, $reservedChildrenNursery += 1]]">>
 				<<if $slaves[_u].reservedChildrenNursery > 0>>
@@ -239,7 +239,7 @@ Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $
 				<<if ($reservedChildrenNursery + $slaves[_u].pregType - $slaves[_u].reservedChildrenNursery) <= $freeCribs>>
 					| <<print "[[Keep the rest of her children|Nursery][$reservedChildrenNursery += ($slaves[" + _u + "].pregType - $slaves[" + _u + "].reservedChildrenNursery), $slaves[" + _u + "].reservedChildrenNursery += ($slaves[" + _u + "].pregType - $slaves[" + _u + "].reservedChildrenNursery), $slaves[" + _u + "].reservedChildren = 0]]">>
 				<</if>>
-			<<elseif ($slaves[_u].reservedChildrenNursery == $slaves[_u].pregType) || ($reservedChildrenNursery == $freeCribs) || ($slaves[_u].reservedChildrenNursery - $slaves[_u].reservedChildren >= 0)>>
+			<<elseif ($slaves[_u].reservedChildrenNursery == $slaves[_u].pregType) || ($reservedChildrenNursery == $freeCribs) || ($slaves[_u].reservedChildren + $slave[_u].reservedChildrenNursery == $slaves[_u].pregType)>>
 				<br>&nbsp;&nbsp;&nbsp;&nbsp;
 				<<print "[[Keep one less child|Nursery][$slaves[" + _u + "].reservedChildrenNursery -= 1, $reservedChildrenNursery -= 1]]">>
 				<<if $slaves[_u].reservedChildrenNursery > 1>>
diff --git a/src/js/assignJS.tw b/src/js/assignJS.tw
index c75e2802d1631856c1b4278ad7fec0422efb15fa..6132187cf48a79d3a3ab18a11554acb1d6126e33 100644
--- a/src/js/assignJS.tw
+++ b/src/js/assignJS.tw
@@ -211,6 +211,7 @@ window.assignJob = function assignJob(slave, job) {
 			slave.assignmentVisible = 0;
 			V.nurserySlaves++;
 			V.NurseryiIDs.push(slave.ID);
+			slave.livingRules = "normal";
 			break;
 
 		case "be the attendant":
diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index d097848d3c445386ad5f3a26508316f9a3fa1e11..c605b20dd12243e50ab0de26970f3059abb83cd1 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -101,7 +101,7 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $
 			<<else>>
 				All $slaves[_u].reservedChildren of her children will be placed in $incubatorName.
 			<</if>>
-			<<if ($slaves[_u].reservedChildren < $slaves[_u].pregType) && ($reservedChildren < $freeTanks) && ($slaves[_u].reservedChildren - $slaves[_u].reservedChildrenNursery > 0)>>
+			<<if ($slaves[_u].reservedChildren + $slaves[_u].reservedChildrenNursery < $slaves[_u].pregType)  && ($reservedChildren < $freeTanks)>>
 				<br>&nbsp;&nbsp;&nbsp;&nbsp;
 				<<print "[[Keep another child|Incubator][$slaves[" + _u + "].reservedChildren += 1, $reservedChildren += 1]]">>
 				<<if $slaves[_u].reservedChildren > 0>>
@@ -113,7 +113,7 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $
 				<<if ($reservedChildren + $slaves[_u].pregType - $slaves[_u].reservedChildren) <= $freeTanks>>
 					| <<print "[[Keep the rest of her children|Incubator][$reservedChildren += ($slaves[" + _u + "].pregType - $slaves[" + _u + "].reservedChildren), $slaves[" + _u + "].reservedChildren += ($slaves[" + _u + "].pregType - $slaves[" + _u + "].reservedChildren), $slaves[" + _u + "].reservedChildrenNursery = 0]]">>
 				<</if>>
-			<<elseif ($slaves[_u].reservedChildren == $slaves[_u].pregType) || ($reservedChildren == $freeTanks) || ($slaves[_u].reservedChildren - $slaves[_u].reservedChildrenNursery >= 0)>>
+			<<elseif ($slaves[_u].reservedChildren == $slaves[_u].pregType) || ($reservedChildren == $freeTanks) || ($slaves[_u].reservedChildren + $slave[_u].reservedChildrenNursery == $slaves[_u].pregType)>>
 				<br>&nbsp;&nbsp;&nbsp;&nbsp;
 				<<print "[[Keep one less child|Incubator][$slaves[" + _u + "].reservedChildren -= 1, $reservedChildren -= 1]]">>
 				<<if $slaves[_u].reservedChildren > 1>>