diff --git a/.jshintrc b/.jshintrc
index 3be7392d7eddf06ac873c8b06f1de07b2e98e0a7..c5b16f7d864577aaa02028a102ad851e3ce0ec99 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -2,7 +2,7 @@
 	"browser": true,
 	"devel": true,
 	"jquery": true,
-	"esversion": 6,
+	"esversion": 8,
 	"eqeqeq": true,
 	"nocomma": true,
 	"undef": false,
diff --git a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
index 41ee8e1e832badd9f695a8e7afe8efe7fce17bd4..fd55cbd63b4d62d96f2d1a73f3312335c242cadb 100644
--- a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
+++ b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
@@ -20,21 +20,7 @@
 <<set $rep = Number($rep) || 0>>
 <<set $cash = Number($cash) || 0>>
 <<set $week = Number($week) || 1>>
-<<set $tempSlave.preg = Number($tempSlave.preg) || 0>>
-<<set $tempSlave.pregType = Number($tempSlave.pregType) || 0>>
-<<if $tempSlave.broodmother == 0>>
-	<<set WombInit($tempSlave)>> /* just to make sure */
-	<<set $tempSlave.womb.length = 0>> /* simple way to delete all fetuses */
-	<<set WombImpregnate($tempSlave, $tempSlave.pregType, $tempSlave.pregSource, $tempSlave.preg)>> /* recreates fetuses */
-<<else>>
-	<<set WombNormalizePreg($tempSlave)>>
-<</if>>
-<<set $tempSlave.pregWeek = Number($tempSlave.pregWeek) || Math.max($tempSlave.preg, 0)>>
-<<if $tempSlave.preg <= 0>>
-	<<set $tempSlave.pregKnown = 0>>
-<<elseif $tempSlave.preg > 0>>
-	<<set $tempSlave.pregKnown = 1>>
-<</if>>
+<<set WombUpdatePregVars($tempSlave)>>
 <<set $tempSlave.pregAdaptation = Number($tempSlave.pregAdaptation) || 0>>
 <<if $tempSlave.pregAdaptation <= 0>>
 	<<if $tempSlave.genes === "XY">> /* copied from GenerateXYPregAdaptation */
diff --git a/src/facilities/pit/pit.js b/src/facilities/pit/pit.js
index 10e067858ee1505f4acf4773e072a26cd9143add..fd4b4dad3560407728a89a96709ca53cd0e44dc0 100644
--- a/src/facilities/pit/pit.js
+++ b/src/facilities/pit/pit.js
@@ -164,14 +164,17 @@ App.Facilities.Pit.pit = function() {
 
 							App.UI.DOM.replace(fightersDiv, fighters);
 							App.UI.DOM.replace(lethalityDiv, lethality);
-						}),
+						}));
+
+					if (S.Bodyguard) {
 						App.UI.DOM.link("Have them fight your bodyguard", () => {
 							V.pit.bodyguardFights = true;
 							V.pit.animal = null;
 
 							App.UI.DOM.replace(fightersDiv, fighters);
 							App.UI.DOM.replace(lethalityDiv, lethality);
-						}));
+						})
+					}
 
 					animalDiv.appendChild(App.Facilities.Pit.animals());
 				} else {
diff --git a/src/interaction/killSlave.js b/src/interaction/killSlave.js
index 7a9f20ca17333992687f591abf56db40c29c88db..881d0179bb4ceb3400a880b0eaaf43cedb491657 100644
--- a/src/interaction/killSlave.js
+++ b/src/interaction/killSlave.js
@@ -4,7 +4,7 @@
 App.UI.SlaveInteract.killSlave = function(slave) {
 	// MARK: Declarations
 
-	const frag = new DocumentFragment;
+	const frag = new DocumentFragment();
 	const {He, His, he, him, his, daughter, himself} = getPronouns(slave);
 
 	const FS = {