diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index d998a4929960cf42f137caf12f91c1169874d83d..7e161d83fac52c8e63b2aef3e8fe9a63775155d1 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,11 @@
0.10.7.0/1
+3/25/2018
+
+ 8
+ -fixes and tweaks, nothing major
+
3/24/2018
7
diff --git a/src/uncategorized/arcade.tw b/src/uncategorized/arcade.tw
index 8afe05a4e0fb81a05bc3ac9f16f34b0a3b260b1c..c778f7c0a3d55143c79893d4c8934602dd7c8bc6 100644
--- a/src/uncategorized/arcade.tw
+++ b/src/uncategorized/arcade.tw
@@ -77,7 +77,7 @@ $arcadeNameCaps
<</link>>
<</if>>
-<br>It can support $arcade inmates. Currently $arcadeSlaves slaves are incarcerated.
+<br>It can support $arcade inmates. Currently $arcadeSlaves <<if $arcadeSlaves == 1>>slave is<<else>>slaves are</if>> incarcerated.
<<if ($arcade < $arcadeSlaves) && ($arcadeUpgradeFuckdolls == 1)>>
@@.yellow;$arcadeNameCaps is overcrowded;@@ the least popular inmate will be converted to a standard Fuckdoll this week.
<</if>>
diff --git a/src/uncategorized/brothel.tw b/src/uncategorized/brothel.tw
index 05bb0de0aec236234c7edf283ad9a7e06e22fe28..ba039305f07f3cefe0a7724857031b0a1b284117 100644
--- a/src/uncategorized/brothel.tw
+++ b/src/uncategorized/brothel.tw
@@ -146,7 +146,7 @@ $brothelNameCaps
<</if>>
<<set _Tmult0 = Math.trunc($brothel*1000*$upgradeMultiplierArcology)>>
-<br>It can support $brothel whores. Currently $brothelSlaves whore at $brothelNameCaps.
+<br>It can support $brothel whores. Currently $brothelSlaves whore<<if $brothelSlaves == 1>>s</if>> at $brothelNameCaps.
[[Expand the brothel|Brothel][$cash -= _Tmult0, $brothel += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>> and will increase upkeep costs//
<br>
diff --git a/src/uncategorized/cellblock.tw b/src/uncategorized/cellblock.tw
index e3ce235f0e82d6ca4cac92056fe5bbcfbaa201c3..ebe69abeb10239876739ec4808e0b7ac452ef26c 100644
--- a/src/uncategorized/cellblock.tw
+++ b/src/uncategorized/cellblock.tw
@@ -71,7 +71,7 @@ $cellblockNameCaps
<</if>>
<<set _Tmult0 = Math.trunc($cellblock*1000*$upgradeMultiplierArcology)>>
-<br>$cellblockNameCaps has room for $cellblock slaves to be kept in close confinement. Currently $cellblockSlaves are kept in close confinement.
+<br>$cellblockNameCaps has room for $cellblock slaves to be kept in close confinement. Currently $cellblockSlaves <<if $cellblockSlaves == 1>>is<<else>>are</if>> kept in close confinement.
[[Expand the cellblock|Cellblock][$cash -= _Tmult0, $cellblock += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>//
<br>
diff --git a/src/uncategorized/club.tw b/src/uncategorized/club.tw
index d305cafff56ae09b8753ffe6a436f589973402bc..508618a33fb0b942e0ffdb9abbfd5c8c96973cdd 100644
--- a/src/uncategorized/club.tw
+++ b/src/uncategorized/club.tw
@@ -201,7 +201,7 @@ $clubNameCaps
<</if>>
<<set _Tmult0 = Math.trunc($club*1000*$upgradeMultiplierArcology)>>
-<br>There are rooms off $clubName to support slaves as they work as club sluts. They can support $club slaves. Currently $clubSlaves are serving in $clubName.
+<br>There are rooms off $clubName to support slaves as they work as club sluts. They can support $club slaves. Currently $clubSlaves <<if $clubSlaves == 1>>is<<else>>are</if>> serving in $clubName.
[[Expand the club|Club][$cash -= _Tmult0, $club += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>> and will increase upkeep costs//
<br>
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index 64ae1aaa0d20eb2326777f6e6ae3eb62d9740993..f814e838123ef9ffc78765ee8f011a08f156a9c9 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -307,7 +307,7 @@ $dairyNameCaps
<</if>>
<<set _Tmult0 = Math.trunc($dairy*1000*$upgradeMultiplierArcology)>>
-<br>$dairyNameCaps can support $dairy milkers. There are currently $dairySlaves cows. [[Expand the dairy|Dairy][$cash -= _Tmult0, $dairy += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>> and will increase upkeep costs//
+<br>$dairyNameCaps can support $dairy milkers. There are currently $dairySlaves cow<<if $dairySlaves != 1>>s<</if>>. [[Expand the dairy|Dairy][$cash -= _Tmult0, $dairy += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>> and will increase upkeep costs//
<<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology)>>
<br>
diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw
index 92a5434686fd9d2587711a1a36cc1d137835bfc1..75ade0bc5055f40c62b4c1aabb2376f13dcd9e10 100644
--- a/src/uncategorized/dispensary.tw
+++ b/src/uncategorized/dispensary.tw
@@ -273,14 +273,16 @@ Dietary Upgrades
<br>
<</if>>
-<<if $dietFertility != 1>>
- [[Purchase recipes to encourage ovulation|Dispensary][$cash -= 5000*_PCSkillCheck, $dietFertility = 1]]
- //Costs <<print cashFormat(3000*_PCSkillCheck)>>//
- <br> //Will allow for specially designed meals to be served in the cafeteria to promote slave fertility.//
- <br>
-<<elseif $dietFertility == 1>>
- The fabricator is producing meals to be served in the cafeteria designed to promote slave fertility.
- <br>
+<<if $seePreg == 1>>
+ <<if $dietFertility != 1>>
+ [[Purchase recipes to encourage ovulation|Dispensary][$cash -= 5000*_PCSkillCheck, $dietFertility = 1]]
+ //Costs <<print cashFormat(3000*_PCSkillCheck)>>//
+ <br> //Will allow for specially designed meals to be served in the cafeteria to promote slave fertility.//
+ <br>
+ <<elseif $dietFertility == 1>>
+ The fabricator is producing meals to be served in the cafeteria designed to promote slave fertility.
+ <br>
+ <</if>>
<</if>>
<<if $dietCleanse == 0>>
diff --git a/src/uncategorized/masterSuite.tw b/src/uncategorized/masterSuite.tw
index bc565c00cac996ca7deaeefc5bd2f40481c97aa4..0e5341b983021ec1d16203753530e2eb8b107cd4 100644
--- a/src/uncategorized/masterSuite.tw
+++ b/src/uncategorized/masterSuite.tw
@@ -294,7 +294,7 @@ $masterSuiteNameCaps is furnished
<</if>>
-<br>$masterSuiteNameCaps has room for $masterSuite slaves to live comfortably<<if $masterSuiteUpgradeLuxury == 2>> in the moments when they're not in the fuckpit<<elseif $masterSuiteUpgradeLuxury == 1>> on its huge bed<</if>>. There are currently $masterSuiteSlaves in $masterSuiteNameCaps.
+<br>$masterSuiteNameCaps has room for $masterSuite slaves to live comfortably<<if $masterSuiteUpgradeLuxury == 2>> in the moments when they're not in the fuckpit<<elseif $masterSuiteUpgradeLuxury == 1>> on its huge bed<</if>>. There are currently $masterSuiteSlaves slave<<if $masterSuiteSlaves != 1>>s</if>> in $masterSuiteNameCaps.
<<set _Tmult0 = Math.trunc($masterSuite*1000*$upgradeMultiplierArcology)>>
[[Expand the Master Suite|Master Suite][$cash -= _Tmult0, $masterSuite += 2, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>//
<<if $Concubine == 0 && $masterSuiteSlaves == 0>>
diff --git a/src/uncategorized/rulesAutosurgery.tw b/src/uncategorized/rulesAutosurgery.tw
index 14934f98be80d7913ae11d5ac169497e9109ff48..2a61403ba77ca4fca0beb4b5bca560f026243a55 100644
--- a/src/uncategorized/rulesAutosurgery.tw
+++ b/src/uncategorized/rulesAutosurgery.tw
@@ -204,12 +204,14 @@
<<set $surgeries.push("surgery to remove her butt implants")>>
<<set $slaves[$i].butt -= $slaves[$i].buttImplant>>
<<set $slaves[$i].buttImplant = 0>>
+ <<set $slaves[$i].buttImplantType = 0>>
<<set $cash -= $surgeryCost>>
<<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($thisSurgery.boobs == 0) && ($slaves[$i].boobsImplant > 0)>>
<<set $surgeries.push("surgery to remove her boob implants")>>
<<set $slaves[$i].boobs -= $slaves[$i].boobsImplant>>
<<set $slaves[$i].boobsImplant = 0>>
+ <<set $slaves[$i].boobsImplantType = 0>>
<<set $cash -= $surgeryCost>>
<<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].butt <= 3) && ($slaves[$i].butt < $thisSurgery.butt)>>
diff --git a/src/uncategorized/saDiet.tw b/src/uncategorized/saDiet.tw
index e2b275ac84237d1b3410c799469755b764634c55..d08212738e2c8bfefe23f8fe2bb3887ec6c0edf2 100644
--- a/src/uncategorized/saDiet.tw
+++ b/src/uncategorized/saDiet.tw
@@ -714,7 +714,13 @@
<</if>>
<<case "fertility">> /* + ovum and small boosts to energy and attrXY */
<<if !canGetPregnant($slaves[$i])>>
- She is no longer able to get pregnant, for one reason or another. @@.yellow;Her fertility diet has been ended.@@
+ <<if $slaves[$i].pregKnown == 0 && $slaves[$i].preg > 0>>
+ The diet is not properly working; tests reveal the reason is a @@.lime;new pregnancy.@@
+ <<set $slaves[$i].pregKnown = 1>>
+ <<else>>
+ She is no longer able to get pregnant, for one reason or another.
+ <</if>>
+ @@.yellow;Her fertility diet has been ended.@@
<<set $slaves[$i].diet = "healthy">>
<</if>>
<<if $slaves[$i].fetish == "mindbroken">>
diff --git a/src/uncategorized/schoolroom.tw b/src/uncategorized/schoolroom.tw
index 461bf359c2e73b0ce8d67e283f138bb157c33313..3a1a772d204e4f1b8ccd773b1ba318444396207b 100644
--- a/src/uncategorized/schoolroom.tw
+++ b/src/uncategorized/schoolroom.tw
@@ -71,7 +71,7 @@ $schoolroomNameCaps is well-equipped, with wall screens to display lessons. Thes
[[Decommission the schoolroom|Main][$schoolroom = 0, $schoolroomUpgradeSkills = 0, $schoolroomUpgradeLanguage = 0, $schoolroomUpgradeRemedial = 0, $schoolroomDecoration = "standard"]]
<</if>>
<<set _Tmult0 = Math.trunc($schoolroom*1000*$upgradeMultiplierArcology)>>
-<br>$schoolroomNameCaps has room to house $schoolroom slaves while they learn. Currently $schoolroomSlaves are learning.
+<br>$schoolroomNameCaps has room to house $schoolroom slaves while they learn. Currently $schoolroomSlaves <<if $schoolroomSlaves == 1>>is<<else>>are</if>> learning.
[[Expand the schoolroom|Schoolroom][$cash -= _Tmult0, $schoolroom += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>//
<br>
diff --git a/src/uncategorized/servantsQuarters.tw b/src/uncategorized/servantsQuarters.tw
index 9d795664cd0c4ec6820921de1c0b557758701e70..3c93fdb9715c3813a661c28d585ce167a73e4184 100644
--- a/src/uncategorized/servantsQuarters.tw
+++ b/src/uncategorized/servantsQuarters.tw
@@ -71,7 +71,7 @@ $servantsQuartersNameCaps
<</if>>
<<set _Tmult0 = Math.trunc($servantsQuarters*1000*$upgradeMultiplierArcology)>>
-<br>$servantsQuartersNameCaps has room to keep $servantsQuarters slaves while they serve. Currently $servantsQuartersSlaves are serving.
+<br>$servantsQuartersNameCaps has room to keep $servantsQuarters slaves while they serve. Currently $servantsQuartersSlaves <<if $servantsQuartersSlaves == 1>>is<<else>>are</if>> serving.
[[Expand the Servants' Quarters|Servants' Quarters][$cash -= _Tmult0, $servantsQuarters += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>//
<br>
diff --git a/src/uncategorized/spa.tw b/src/uncategorized/spa.tw
index c809b43ebd5971983ab69208fe541b080fbc9b8b..ad631ee8adda4c224b4fa673ff700029a42817e4 100644
--- a/src/uncategorized/spa.tw
+++ b/src/uncategorized/spa.tw
@@ -71,7 +71,7 @@ $spaNameCaps
<</if>>
<<set _Tmult0 = Math.trunc($spa*1000*$upgradeMultiplierArcology)>>
-<br>$spaNameCaps can house $spa slaves while they recuperate here. Curretly $spaSlaves are recuperating.
+<br>$spaNameCaps can house $spa slaves while they recuperate here. Curretly $spaSlaves <<if $spaSlaves == 1>>is<<else>>are</if>> recuperating.
[[Expand the spa|Spa][$cash -= _Tmult0, $spa += 5]] //Costs <<print cashFormat(_Tmult0)>>//
<br>
diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw
index a52df2fd0ab2ac311c226581c735e08443f57561..ab3a63ecf43c6d492f50315ee8bbdc9bfb44a281 100644
--- a/src/utility/raWidgets.tw
+++ b/src/utility/raWidgets.tw
@@ -4144,7 +4144,12 @@ Your brand design is ''$brandDesign.''
<<else>>
<<if ($args[0].diet !== "healthy")>>
<<set $args[0].diet = "healthy">>
- <br>$args[0].slaveName has been put on a standard diet since she is currently unable to become pregnant.
+ <<if $args[0].pregKnown == 0 && $args[0].preg > 0>>
+ <br>$args[0].slaveName has been put on a standard diet since tests reveal she has become pregnant.
+ <<set $args[0].pregKnown = 1>>
+ <<else>>
+ <br>$args[0].slaveName has been put on a standard diet since she is currently unable to become pregnant.
+ <</if>>
<</if>>
<</if>>
<<elseif (_combinedRule.diet == "cum production")>>