diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 5160486b4ab1c81d12a0acde0fd2cf96fae6d2c0..ba41ee437a579b54af1cc18607c6a4cfeddc91f5 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,12 @@
 
 0.10.7.0/1
 
+3/16/2018
+
+	398
+	-fixed HG, BG, and HG's slave not showing up in endweek if you have no other slaves in the penthouse
+	-various text fixes
+
 3/15/2018
 
 	397
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 0662a1b5921a11a93807b842bcc6540a98f8ba78..1f329e53e3589867be4116d1771c231435bff6e4 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -5844,7 +5844,7 @@ May I plea<<s>>e try out <<s>>omething <<s>>kimpier today?"
 	<</if>>
 	She automatically begins to rub herself up and down to stimulate you; once she feels you reach <<if $PC.dick == 0>>full arousal<<else>>rock hardness<<if $PC.vagina == 1>> and total wetness<</if>><</if>> she
 	<<if $activeSlave.height >= 170>>
-		leans into the rail, bending over it just slightly to offer her asshole at just the right height
+		leans into the rail, bending over it just slightly to offer her asshole at just the right height.
 	<<else>>
 		hikes herself up on the rail, up on tiptoe, to bring her asshole to the most comfortable height.
 	<</if>>
diff --git a/src/uncategorized/arcade.tw b/src/uncategorized/arcade.tw
index 3ac718c1a12b3ac91f44a9822101f9962d298825..8afe05a4e0fb81a05bc3ac9f16f34b0a3b260b1c 100644
--- a/src/uncategorized/arcade.tw
+++ b/src/uncategorized/arcade.tw
@@ -91,7 +91,7 @@ $arcadeNameCaps
 <<elseif $arcadeUpgradeCollectors == 1>>
 	It has been retrofitted to milk lactating slaves<<if $seeDicks != 0>> and cockmilk slaves capable of ejaculating<</if>>, though less efficiently than a dedicated facility.
 <<else>>
-	<br>It is a standard arcade. It can be upgraded to either maximize the pleasure of those that visit it at the expense of the health or the inmates, or to keep them healthy (if not happy) and milk them of useful fluids.<br>
+	<br>It is a standard arcade. It can be upgraded to either maximize the pleasure of those that visit it at the expense of the health of the inmates, or to keep them healthy (if not happy) and milk them of useful fluids.<br>
 	[[Upgrade the arcade with invasive performance-enhancing systems|Arcade][$cash -= _Tmult1, $arcadeUpgradeInjectors = 1]] | [[Retrofit the arcade to collect useful fluids|Arcade][$cash -= _Tmult1, $arcadeUpgradeCollectors = 1]]<br>
 	//Choosing either upgrade will cost <<print cashFormat(_Tmult1)>> and will increase upkeep costs. They are mutually exclusive; only one can be chosen.// <br>
 <</if>>
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index 794053b3271e0372fc794d0cafa66c63a904341a..71ab2e78e1885643da2a6543ad3368b59cf2962b 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -36,7 +36,7 @@
 		.map((s, idx) => ({ID: s.ID, idx: idx, name: s.slaveName, assignment: s.assignment}))
 		.filter(s => s.ID === _i).map(s => s.idx + ' - ' + s.name + ' (' + s.assignment + ')').join(', ')>>@@
 <</foreach>>
-<<set _visibleSlaves = $slaves.filter(s => s.assignmentVisible == 1 && (s.assignment != "be your Head Girl" || $HGSuite != 1) && (s.assignment != "guard you" || $dojo <= 1)),
+<<set _visibleSlaves = $slaves.filter(s => (s.assignmentVisible == 1 && s.assignment != "be your Head Girl" && s.assignment != "guard you") || (s.assignment == "be your Head Girl" && $HGSuite != 1) || (s.assignment == "guard you" && $dojo <= 1)),
 	$slavesVisible = _visibleSlaves.length,
 	$dormitoryPopulation = _visibleSlaves.filter(s => s.livingRules != "luxurious").length,
 	$roomsPopulation = $slavesVisible - $dormitoryPopulation - _visibleSlaves.filter(s => s.livingRules == "luxurious" && s.relationship >= 4).length * 0.5,
@@ -45,6 +45,11 @@
 	_RC = $slaves.findIndex(s => s.ID == $Recruiter.ID),
 	_BG = $slaves.findIndex(s => s.ID == $Bodyguard.ID)>>
 
+<<if (_HG > -1 && $HGSuite > 0)>><<set $slavesVisible++>><</if>>
+<<if ($HGSuiteSlaves > 0)>><<set $slavesVisible++>><</if>>
+<<if (_BG > -1 && $dojo > 1)>><<set $slavesVisible++>><</if>>
+
+
 <<set $nextButton = "END WEEK", $nextLink = "End Week", $showEncyclopedia = 1, $encyclopedia = "How to Play">>
 /*<<include "Costs">>*/
 <<set $costs = getCost($slaves)>>