diff --git a/src/005-passages/interactPassages.js b/src/005-passages/interactPassages.js
index 40683579406aeaeb4d844fe533556db37cc2358c..728fd9d206bcb5c4047ddc36019b1de663648200 100644
--- a/src/005-passages/interactPassages.js
+++ b/src/005-passages/interactPassages.js
@@ -424,15 +424,15 @@ new App.DomPassage("Inspect PC Fetus Tank Settings",
 new App.DomPassage("Transfer All Player Ova Select",
 () => {
 	V.nextButton = "Cancel";
-	V.nextLink = passage()
+	V.nextLink = "Main";
 	return App.UI.transferAllPlayerOvaSelect();
 }
 );
 
 new App.DomPassage("Transfer All Player Ova",
 () => {
-	V.nextButton = "Cancel";
-	V.nextLink = passage()
+	V.nextButton = "Continue";
+	V.nextLink = "Main";
 	return App.UI.transferAllPlayerOva();
 }
 );
\ No newline at end of file
diff --git a/src/player/managePersonalAffairs.js b/src/player/managePersonalAffairs.js
index b64cca379c48d5182a86faa051ae86299d32ccad..490141859924413a9507eb51d0cd7d2f77b448e6 100644
--- a/src/player/managePersonalAffairs.js
+++ b/src/player/managePersonalAffairs.js
@@ -361,7 +361,7 @@ App.UI.managePersonalAffairs = function() {
 				text.push(`You have a bun baking in the oven.`);
 
 				if (arcology.FSRestart === "unset" || V.eugenicsFullControl === 1 || (V.PC.pregSource !== -1 && V.PC.pregSource !== -6)) {
-					text.push(App.UI.DOM.link(`Pop some morning after pills.`, () => {
+					text.push(App.UI.DOM.link(`Pop some morning after pills`, () => {
 						WombFlush(V.PC);
 
 						App.UI.DOM.replace(appearanceDiv, appearance);
@@ -369,7 +369,8 @@ App.UI.managePersonalAffairs = function() {
 						App.UI.DOM.replace(pregnancyDiv, pregnancy);
 					}));
 				}
-				if (V.pregnancyMonitoringUpgrade > 0) {
+				text.push(`if you want to get rid of it.`)
+				if (V.pregnancyMonitoringUpgrade && V.surgeryUpgrade) {
 					text.push(`But if you want to keep your progeny without having to give birth, you can`);
 					text.push(App.UI.DOM.passageLink(`transfer ${V.PC.womb.length > 1 ? "all your ova" : "your ovum"} to a slave.`, "Transfer All Player Ova Select", () => {
 					}));
diff --git a/src/pregmod/surrogacy.js b/src/pregmod/surrogacy.js
index 2b3d0b2c4bcf700fcff34ff64829efb4b609c9a1..6b800ead9d3ac64ef885380ecd8c1da441c0fdcb 100644
--- a/src/pregmod/surrogacy.js
+++ b/src/pregmod/surrogacy.js
@@ -249,19 +249,23 @@ App.UI.surrogacy = function() {
 /** Transfers all PC ova to a selected slave
  */
 App.UI.transferAllPlayerOva = function() {
-    let fetus;
+	const node = new DocumentFragment();
+	let fetus;
 	let receptrix = getSlave(V.receptrix.ID);
     const ovaTotal = V.PC.womb.length;
 	let r = [];
 
     for (let ovusNum = 0; ovusNum < ovaTotal; ovusNum++) {
-        fetus = WombRemoveFetus(V.PC, ovusNum);
-        WombAddFetus(receptrix, fetus);
-    }
+        fetus = WombRemoveFetus(V.PC, 0);
+		WombAddFetus(receptrix, fetus);
+		V.PC.preg = WombMaxPreg(V.PC);
+	}
 
-    WombNormalizePreg(receptrix);
-    WombNormalizePreg(V.PC);
-    cashX(forceNeg(V.surgeryCost * 2 * ovaTotal), "PCmedical");
+	receptrix.preg = WombMaxPreg(receptrix);
+	V.PC.preg = WombMaxPreg(V.PC);
+	WombNormalizePreg(receptrix);
+	WombNormalizePreg(V.PC);
+	cashX(forceNeg(V.surgeryCost * 2 * ovaTotal), "PCmedical");
 	const {
 		He,
 		he, his, him
@@ -331,7 +335,7 @@ App.UI.transferAllPlayerOvaSelect = function() {
 		) {
 			const div = App.UI.DOM.appendNewElement("div", node, App.UI.DOM.referenceSlaveWithPreview(slave, SlaveFullName(slave)));
 			div.append(" ", App.UI.DOM.passageLink(
-				"Select", "transferAllPlayerOva",
+				"Select", "Transfer All Player Ova",
 				() => {
 					V.receptrix = slave;
 				}