diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index 6b703ed3408f80050100e33bcaf35547f4a40a05..e128f157d2b9cf7a757332eddfa8bba5903a8ce4 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -421,6 +421,7 @@ App.Data.defaultGameStateVariables = {
 	useSlaveListInPageJSNavigation: 0,
 	useSlaveSummaryOverviewTab: 0,
 	useSlaveSummaryTabs: 0,
+	useSlaveArcologyTab: 0,
 	useTabs: 0,
 	verboseDescriptions: 0,
 	verticalizeArcologyLinks: 0,
diff --git a/src/004-base/arcologyBuilding.js b/src/004-base/arcologyBuilding.js
index 162162f5a4f3440db6d9abb50888d2e1e83234e6..53c712a908384b15ecc90aa2da1d294a690d9bda 100644
--- a/src/004-base/arcologyBuilding.js
+++ b/src/004-base/arcologyBuilding.js
@@ -176,9 +176,9 @@ App.Arcology.Cell.BaseCell = class extends App.Entity.Serializable {
 					span.append(App.Arcology.getCellLink("Sell", that.name, () => that.cellPassage(containingBuilding),
 						() => {
 							cashX(price(false), "capEx");
-							App.Arcology.updateOwnership();
 							A.demandFactor -= DEMAND_FACTOR_DIFF;
 							cell.owner = 0;
+							App.Arcology.updateOwnership();
 						}));
 					fragment.append(" ", span);
 				}
@@ -192,8 +192,8 @@ App.Arcology.Cell.BaseCell = class extends App.Entity.Serializable {
 						() => {
 							cashX(-(price(true) + 10000), "capEx");
 							A.demandFactor += DEMAND_FACTOR_DIFF;
-							App.Arcology.updateOwnership();
 							cell.owner = 1;
+							App.Arcology.updateOwnership();
 						}));
 					fragment.append(" ", buySpan);
 
@@ -207,8 +207,8 @@ App.Arcology.Cell.BaseCell = class extends App.Entity.Serializable {
 								() => {
 									repX(-(repPrice), "capEx");
 									A.demandFactor += DEMAND_FACTOR_DIFF;
-									App.Arcology.updateOwnership();
 									cell.owner = 1;
+									App.Arcology.updateOwnership();
 								}));
 						fragment.append(repDiv);
 					}
diff --git a/src/arcologyBuilding/penthouse.js b/src/arcologyBuilding/penthouse.js
index 396383f95e4b7e71e4a645292e913e9b77fc67c6..5581f0c629ad26321d39215c2c053fbd2944778b 100644
--- a/src/arcologyBuilding/penthouse.js
+++ b/src/arcologyBuilding/penthouse.js
@@ -69,7 +69,7 @@ App.Arcology.Cell.Penthouse = class extends App.Arcology.Cell.BaseCell {
 					(tankSlaveCount() + FetusGlobalReserveCount("incubator")), "empty tank")})`;
 
 				if (App.Facilities.Incubator.readySlaves() > 0) {
-					wrapper.append(createFacilityDiv(link, App.UI.DOM.combineNodes(desc, App.UI.DOM.makeElement("span", "[!]", ["noteworthy"]))));
+					wrapper.append(createFacilityDiv(link, App.UI.DOM.combineNodes(desc, App.UI.DOM.makeElement("span", "\uf06a", ["noteworthy", "icons"]))));
 				} else {
 					wrapper.append(createFacilityDiv(link, desc));
 				}
diff --git a/src/endWeek/player/prPregnancy.js b/src/endWeek/player/prPregnancy.js
index b2826c8b50be60453d7c0b26a63e8402be38f6cb..803117e24e7c47bad40dc710013aa2d6c79dd6dd 100644
--- a/src/endWeek/player/prPregnancy.js
+++ b/src/endWeek/player/prPregnancy.js
@@ -354,7 +354,7 @@ App.EndWeek.Player.pregnancy = function(PC = V.PC) {
 					}
 				}
 			} else if (boobSize < boobTarget) {
-				if (PC.weight <= 35 && random(random(1, 100) > 50)) {
+				if (PC.weight <= 35 && random(1, 100) > 50) {
 					r.push(`You can't help but <span class="change negative">put on a little baby weight</span> due to your increased appetite.`);
 					PC.weight += 1;
 				}
diff --git a/src/gui/options/options.js b/src/gui/options/options.js
index dc90d275dd20d5ec44694fb067fd9ec4de2ef028..366bfbf11857100f30d6494fd42d0eb0302867bf 100644
--- a/src/gui/options/options.js
+++ b/src/gui/options/options.js
@@ -979,6 +979,9 @@ App.Intro.display = function(isIntro) {
 	options.addOption("Condense special slaves into their own tab", "useSlaveSummaryOverviewTab")
 		.addValue("Enabled", 1).on().addValue("Disabled", 0).off();
 
+	options.addOption("Main Menu category with all slaves", "useSlaveArcologyTab")
+		.addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
 	options.addOption("Interactions with your fucktoys are", "fucktoyInteractionsPosition")
 		.addValueList([["next to them", 1], ["at page bottom", 0]]);
 
diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js
index 1512342fa9af5ca1255906dde983ead6cb85e0b0..6ee4b86dd55489daaff72ee318398ac3e7eb8729 100644
--- a/src/js/slaveListing.js
+++ b/src/js/slaveListing.js
@@ -980,12 +980,12 @@ App.UI.SlaveList.penthousePage = function() {
 		tabs.push(makeTabDesc("overview", "Special Roles", overviewTabContent()));
 	}
 
-	tabs.push(penthouseTab());
-
 	if (V.favorites.length > 0 || V.useSlaveSummaryTabs === 0) {
 		tabs.push(favorites());
 	}
 
+	tabs.push(penthouseTab());
+
 	// tabs for each assignment
 	for (const jn of ph.jobsNames) {
 		const slaves = _slavesForJob(jn);
@@ -996,7 +996,9 @@ App.UI.SlaveList.penthousePage = function() {
 		}
 	}
 
-	tabs.push(arcologyTab());
+	if (V.useSlaveArcologyTab) {
+		tabs.push(arcologyTab());
+	}
 
 	const tabBar = new App.UI.Tabs.TabBar("Main");
 	let buttonClass = undefined;
diff --git a/src/npc/startingGirls/startingGirls.js b/src/npc/startingGirls/startingGirls.js
index e3d43ed274fecfc3de4157146c25b8eae1f320b0..2f8d9e377f719a0c8d0f1e7382bdda5528c87487 100644
--- a/src/npc/startingGirls/startingGirls.js
+++ b/src/npc/startingGirls/startingGirls.js
@@ -149,14 +149,20 @@ App.StartingGirls.cleanup = function(slave) {
 
 	if (slave.anus <= 0) {
 		slave.skill.anal = 0;
-	} else if ((slave.anus > 2 && slave.skill.anal <= 10) || (slave.anus === 0 && slave.skill.anal > 30)) {
-		slave.skill.anal = 15;
+	} else if (slave.anus <= 1) {
+		slave.skill.anal = Math.min(slave.skill.anal, 35);
+	} else if (slave.anus > 2) {
+		slave.skill.anal = Math.max(slave.skill.anal, 15);
 	}
-	if (slave.vagina < 0) {
+
+	if (slave.vagina <= 0) {
 		slave.skill.vaginal = 0;
-	} else if ((slave.vagina > 2 && slave.skill.vaginal <= 10) || (slave.vagina === 0 && slave.skill.vaginal > 30)) {
-		slave.skill.vaginal = 15;
+	} else if (slave.vagina <= 1) {
+		slave.skill.vaginal = Math.min(slave.skill.vaginal, 35);
+	} else if (slave.vagina > 2) {
+		slave.skill.vaginal = Math.max(slave.skill.vaginal, 15);
 	}
+
 	if (slave.dick > 0 && slave.physicalAge >= slave.pubertyAgeXY + 2 && slave.skill.penetrative <= 10) {
 		slave.skill.penetrative = 15;
 	}