diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index e9c20f18e827931b54ddbdebc089b25e47a40a8f..433c4e9741981713ee625ade26f813b443253484 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -739,6 +739,7 @@ App.Data.resetOnNGPlus = {
 	econRate: 0,
 	/** @type {FC.ArcologyState[]} */
 	arcologies: [],
+	/* These variables exist, so skill changes during the week will only influence prizes in the next week */
 	HackingSkillMultiplier: 0,
 	upgradeMultiplierArcology: 0,
 	upgradeMultiplierMedicine: 0,
diff --git a/src/005-passages/facilitiesPassages.js b/src/005-passages/facilitiesPassages.js
index bbb8e1893138fd58c6a18b12b1c3c8a7e43e6497..910e82a782e1668803d556590de4f6ec66b1eafa 100644
--- a/src/005-passages/facilitiesPassages.js
+++ b/src/005-passages/facilitiesPassages.js
@@ -29,8 +29,8 @@ new App.DomPassage("Servants' Quarters", () => { return new App.Facilities.Serva
 
 new App.DomPassage("Spa", () => { return new App.Facilities.Spa.spa().render(); }, ["jump-to-safe", "jump-from-safe"]);
 
-new App.DomPassage("Transport Hub", () => { return App.Mods.SecExp.transportHub.GUI(); });
-new App.DomPassage("Weapons Manufacturing", () => { return App.Mods.SecExp.weapManu.GUI(); }, ["jump-to-safe", "jump-from-safe"]);
+new App.DomPassage("Transport Hub", () => { return App.Mods.SecExp.transportHub.GUI(); }, ["jump-to-safe", "jump-hidden", "jump-from-safe"]);
+new App.DomPassage("Weapons Manufacturing", () => { return App.Mods.SecExp.weapManu.GUI(); }, ["jump-to-safe", "jump-hidden", "jump-from-safe"]);
 new App.DomPassage("securityHQ", () => { return App.Mods.SecExp.secHub.GUI(); }, ["jump-to-safe", "jump-from-safe"]);
 new App.DomPassage("secBarracks", () => { return App.Mods.SecExp.barracks.GUI(); }, ["jump-to-safe", "jump-from-safe"]);
 new App.DomPassage("riotControlCenter", () => { return App.Mods.SecExp.riotCenter.GUI(); }, ["jump-to-safe", "jump-from-safe"]);
diff --git a/src/facilities/geneLab.js b/src/facilities/geneLab.js
index 372571afb5d43dcc3fd24f99cbdfdbfb851a7abb..ab8a1f6f883d7a32e17159ed46d5842d2e8435b6 100644
--- a/src/facilities/geneLab.js
+++ b/src/facilities/geneLab.js
@@ -162,21 +162,27 @@ App.UI.geneLab = function() {
 	App.UI.DOM.appendNewElement("h2", node, `Genetic Harvesting`);
 
 	const humanCloning = 100000 * PCSkillCheck;
-	if (V.cloningSystem !== 1 && V.rep <= 18000 * PCSkillCheck) {
-		App.UI.DOM.appendNewElement("div", node, `You lack the reputation needed to access methods for human cloning`, ["note"]);
-	} else if ((V.cloningSystem !== 1) && (V.rep > 18000 * PCSkillCheck)) {
-		if (V.organFarmUpgrade === 0) {
-			App.UI.DOM.appendNewElement("div", node, `An organ farm is needed to grow the blank embryo to serve as a clone base`, ["note"]);
+	if (V.cloningSystem === 0) {
+		if (V.rep <= 18000 * PCSkillCheck) {
+			if (V.rep >= 20_000) {
+				App.UI.DOM.appendNewElement("div", node, `You have heard rumors of human cloning, but such technology is too advanced for your understanding. Perhaps you should invest into your own education.`, ["note"]);
+			} else {
+				App.UI.DOM.appendNewElement("div", node, `You lack the reputation needed to access methods for human cloning`, ["note"]);
+			}
 		} else {
-			App.UI.DOM.appendNewElement("div", node, App.UI.DOM.link(
-				"Purchase methods for human cloning",
-				() => {
-					cashX(forceNeg(humanCloning), "capEx");
-					V.cloningSystem = 1;
-					App.UI.reload();
-				}, [], "",
-				`Costs ${cashFormat(humanCloning)}. Will allow children to be created with identical base genetics as the source DNA`
-			));
+			if (V.organFarmUpgrade === 0) {
+				App.UI.DOM.appendNewElement("div", node, `An organ farm is needed to grow the blank embryo to serve as a clone base`, ["note"]);
+			} else {
+				App.UI.DOM.appendNewElement("div", node, App.UI.DOM.link(
+					"Purchase methods for human cloning",
+					() => {
+						cashX(forceNeg(humanCloning), "capEx");
+						V.cloningSystem = 1;
+						App.UI.reload();
+					}, [], "",
+					`Costs ${cashFormat(humanCloning)}. Will allow children to be created with identical base genetics as the source DNA`
+				));
+			}
 		}
 	} else if (V.cloningSystem > 0) {
 		App.UI.DOM.appendNewElement("div", node, `The gene lab is capable of implanting a slave's genetic sequence into a blank embryo to produce a basic clone.`);
diff --git a/src/gui/quicklinks.js b/src/gui/quicklinks.js
index 263a1ca55ade8521055c54e07f451f6fa6f93e11..e3bb880bc09a2604f3bb318dd8c0e116c753b05e 100644
--- a/src/gui/quicklinks.js
+++ b/src/gui/quicklinks.js
@@ -119,7 +119,6 @@ App.UI.quickMenu = (function() {
 		"Servants' Quarters": () => !App.Entity.facilities.servantsQuarters.established,
 		"Spa": () => !V.spa,
 		"The Black Market": () => V.rep < 10000,
-		"Weapons Manufacturing": () => true,
 	});
 
 	// show different names than the actual passage name, can be a function