From 042ad3d6551d04839cb8b847a921232b7b1423a8 Mon Sep 17 00:00:00 2001
From: lowercase-donkey <lowercasedonkey@gmail.com>
Date: Fri, 18 Jan 2019 20:39:23 -0500
Subject: [PATCH] Correct some paste errors

---
 src/SecExp/riotControlCenter.tw      |  2 +-
 src/pregmod/implantManufactory.tw    | 14 +++----
 src/uncategorized/dispensary.tw      | 56 ++++++++++++++--------------
 src/uncategorized/managePenthouse.tw |  2 +-
 src/uncategorized/newGamePlus.tw     |  2 +-
 5 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/SecExp/riotControlCenter.tw b/src/SecExp/riotControlCenter.tw
index 7b1934ade94..226e6d29c78 100644
--- a/src/SecExp/riotControlCenter.tw
+++ b/src/SecExp/riotControlCenter.tw
@@ -59,7 +59,7 @@ The riot control center opens its guarded doors to you. The great chamber inside
 <br>
 <br>
 <<if $riotUpgrades.rapidUnit == 0>>
-	[[Create rapid deployment riot units|riotControlCenter][<<run cashX(forceNeg(Math.trunc(7500*$upgradeMultiplierArcology)), "capEx")>>, $riotUpgrades.rapidUnit = 1, $riotUpkeep += $upgradeUpkeep]]
+	[[Create rapid deployment riot units|riotControlCenter][cashX(forceNeg(Math.trunc(7500*$upgradeMultiplierArcology)), "capEx"), $riotUpgrades.rapidUnit = 1, $riotUpkeep += $upgradeUpkeep]]
 	<br>//Costs <<print cashFormat(Math.trunc(7500*$upgradeMultiplierArcology))>>. Will allow spending authority or reputation to lower the progress of rebellions.//
 <<else>>
 	You created a rapid deployment riot unit.
diff --git a/src/pregmod/implantManufactory.tw b/src/pregmod/implantManufactory.tw
index d68a1da0e58..676b49a83b9 100644
--- a/src/pregmod/implantManufactory.tw
+++ b/src/pregmod/implantManufactory.tw
@@ -21,7 +21,7 @@ The manufactory is capable of producing customized fillable implants.
 	//You lack the reputation to access plans for supportive breast implants//
 	<br>
 <<elseif ($meshImplants != 1) && ($rep > 10000*_PCSkillCheck)>>
-	[[Purchase plans for supportive mesh breast implants|Implant Manufactory][<<run cashX(forceNeg(40000*_PCSkillCheck), "capEx")>>, $meshImplants = 1]]
+	[[Purchase plans for supportive mesh breast implants|Implant Manufactory][cashX(forceNeg(40000*_PCSkillCheck), "capEx"), $meshImplants = 1]]
 	//Costs <<print cashFormat(40000*_PCSkillCheck)>>//
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the construction of organic and supportive mesh breast implants.//
 	<br>
@@ -39,7 +39,7 @@ The manufactory is capable of producing customized fillable implants.
 	//You lack the reputation to access experimental fillable abdominal implants//
 	<br>
 <<elseif ($bellyImplants == 0) && ($rep > 2000*_PCSkillCheck)>>
-	[[Purchase schematics for fillable abdominal implants|Implant Manufactory][<<run cashX(forceNeg(30000*_PCSkillCheck), "capEx")>>, $bellyImplants = 1]]
+	[[Purchase schematics for fillable abdominal implants|Implant Manufactory][cashX(forceNeg(30000*_PCSkillCheck), "capEx"), $bellyImplants = 1]]
 	//Costs <<print cashFormat(30000*_PCSkillCheck)>>//
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the construction of fillable abdominal implants for the autosurgery.//
 	<br>
@@ -50,7 +50,7 @@ The manufactory is capable of producing customized fillable implants.
 		//You lack the reputation to access experimental cervix filter micropumps schematics for abdominal implants//
 		<br>
 	<<elseif ($bellyImplants == 1) && ($cervixImplants == 0) && ($rep >6000*_PCSkillCheck)>> /* nanotech like technology much more impressive and costly than simple implant */
-		[[Purchase schematics for cervix filter micropumps|Implant Manufactory][<<run cashX(forceNeg(70000*_PCSkillCheck), "capEx")>>, $cervixImplants = 1]]
+		[[Purchase schematics for cervix filter micropumps|Implant Manufactory][cashX(forceNeg(70000*_PCSkillCheck), "capEx"), $cervixImplants = 1]]
 		//Costs <<print cashFormat(70000*_PCSkillCheck)>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the construction of cervix filter micropumps for fillable abdominal implants using the autosurgery.//
 		<br>
@@ -62,7 +62,7 @@ The manufactory is capable of producing customized fillable implants.
 	<<elseif ($cervixImplants == 1) && ($rep > 8000*_PCSkillCheck)>>
 		The manufactory is capable of crafting cervix filter micropumps for fillable abdominal implants.
 		<br>
-		[[Purchase conversion kits for rectal filter micropumps|Implant Manufactory][<<run cashX(forceNeg(60000*_PCSkillCheck), "capEx")>>, $cervixImplants = 2]]
+		[[Purchase conversion kits for rectal filter micropumps|Implant Manufactory][cashX(forceNeg(60000*_PCSkillCheck), "capEx"), $cervixImplants = 2]]
 		//Costs <<print cashFormat(60000*_PCSkillCheck)>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the construction of the anal equivalent of the cervix micropumps using the autosurgery.//
 		<br>
@@ -84,7 +84,7 @@ The manufactory is capable of producing customized fillable implants.
 		//You lack the reputation to access fertility boosting ovarian implants//
 		<br>
 	<<else>>
-		[[Purchase schematics for fertility enhancing ovarian implants|Implant Manufactory][<<run cashX(forceNeg(10000*_PCSkillCheck), "capEx")>>, $fertilityImplant = 1]]
+		[[Purchase schematics for fertility enhancing ovarian implants|Implant Manufactory][cashX(forceNeg(10000*_PCSkillCheck), "capEx"), $fertilityImplant = 1]]
 		//Costs <<print cashFormat(10000*_PCSkillCheck)>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the construction of implants that encourage multiple eggs being released during ovulation.//
 		<br>
@@ -100,7 +100,7 @@ The manufactory is capable of producing customized fillable implants.
 			//You lack the reputation to access experimental pregnancy generator schematics//
 			<br>
 		<<elseif ($permaPregImplant == 0) && ($rep > 4000*_PCSkillCheck)>>
-			[[Purchase schematics for an experimental implantable pregnancy generator|Implant Manufactory][<<run cashX(forceNeg(40000*_PCSkillCheck), "capEx")>>, $permaPregImplant = 1]]
+			[[Purchase schematics for an experimental implantable pregnancy generator|Implant Manufactory][cashX(forceNeg(40000*_PCSkillCheck), "capEx"), $permaPregImplant = 1]]
 			//Costs <<print cashFormat(40000*_PCSkillCheck)>>//
 			<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the construction of implants that force perpetual pregnancy.//
 			<br>
@@ -123,7 +123,7 @@ Fluid Production Implants
 	//You lack the reputation to access plans for prostate implants//
 	<br>
 <<elseif ($prostateImplants != 1) && ($rep > 3000*_PCSkillCheck)>>
-	[[Purchase plans for ejaculation enhancing prostate implants|Implant Manufactory][<<run cashX(forceNeg(30000*_PCSkillCheck), "capEx")>>, $prostateImplants = 1]]
+	[[Purchase plans for ejaculation enhancing prostate implants|Implant Manufactory][cashX(forceNeg(30000*_PCSkillCheck), "capEx"), $prostateImplants = 1]]
 	//Costs <<print cashFormat(30000*_PCSkillCheck)>>//
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the construction of a prostate implant designed to stimulate fluid production for massive ejaculations. Beware of leaking and dehydration.//
 	<br>
diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw
index 7480c628bf5..38a30a2b380 100644
--- a/src/uncategorized/dispensary.tw
+++ b/src/uncategorized/dispensary.tw
@@ -16,7 +16,7 @@ The Dispensary
 
 <<if ($dispensaryUpgrade == 0)>>
 	<<if ($rep > 5000)>>
-		[[Upgrade the pharmaceutical fabricator|Dispensary][<<run cashX(forceNeg(Math.trunc(30000*$upgradeMultiplierArcology)), "capEx")>>, $dispensaryUpgrade = 1, $drugsCost = (($drugsCost*2)/3)]]
+		[[Upgrade the pharmaceutical fabricator|Dispensary][cashX(forceNeg(Math.trunc(30000*$upgradeMultiplierArcology)), "capEx"), $dispensaryUpgrade = 1, $drugsCost = (($drugsCost*2)/3)]]
 		//Costs <<print cashFormat(Math.trunc(30000*$upgradeMultiplierArcology))>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will improve production efficiency further decreasing costs.//
 		<br>
@@ -33,7 +33,7 @@ The fabricator is producing
 <<if $injectionUpgrade == 0>>
 	standard growth hormones.
 	<<if $rep > 6000>>
-		[[Purchase data on prototype growth hormone tests|Dispensary][<<run cashX(forceNeg(25000*_PCSkillCheck), "capEx")>>, $injectionUpgrade = 1]]
+		[[Purchase data on prototype growth hormone tests|Dispensary][cashX(forceNeg(25000*_PCSkillCheck), "capEx"), $injectionUpgrade = 1]]
 		//Costs <<print cashFormat(25000*_PCSkillCheck)>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Should improve the reliability of growth injections of all kinds.//
 		<br>
@@ -44,7 +44,7 @@ The fabricator is producing
 <<elseif $injectionUpgrade == 1>>
 	prototype growth hormones.
 	<<if $rep > 10000>>
-		[[Upgrade the fabricator to customize each slave's growth hormones|Dispensary][<<run cashX(forceNeg(50000*_PCSkillCheck), "capEx")>>, $injectionUpgrade = 2]]
+		[[Upgrade the fabricator to customize each slave's growth hormones|Dispensary][cashX(forceNeg(50000*_PCSkillCheck), "capEx"), $injectionUpgrade = 2]]
 		//Costs <<print cashFormat(50000*_PCSkillCheck)>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Should improve the reliability of growth injections of all kinds.//
 		<br>
@@ -55,7 +55,7 @@ The fabricator is producing
 <<elseif $injectionUpgrade == 2>>
 	prototype growth hormones.
 	<<if $rep > 14000>>
-		[[Upgrade the fabricator with prototype biomechanical microfactories|Dispensary][<<run cashX(forceNeg(100000*_PCSkillCheck), "capEx")>>, $injectionUpgrade = 3]]
+		[[Upgrade the fabricator with prototype biomechanical microfactories|Dispensary][cashX(forceNeg(100000*_PCSkillCheck), "capEx"), $injectionUpgrade = 3]]
 		//Costs <<print cashFormat(100000*_PCSkillCheck)>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Should improve the reliability of growth injections of all kinds.//
 		<br>
@@ -72,7 +72,7 @@ The fabricator is producing
 <<if $hormoneUpgradeMood == 0>>
 	standardized hormone replacement therapies.
 	<<if $rep > 2000>>
-		[[Upgrade for individualized therapy|Dispensary][<<run cashX(forceNeg(10000*_PCSkillCheck), "capEx")>>, $hormoneUpgradeMood = 1]]
+		[[Upgrade for individualized therapy|Dispensary][cashX(forceNeg(10000*_PCSkillCheck), "capEx"), $hormoneUpgradeMood = 1]]
 		//Costs <<print cashFormat(10000*_PCSkillCheck)>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Should eliminate the occasional moodiness and sexual disinterest caused by generalized therapy.//
 		<br>
@@ -89,7 +89,7 @@ The hormone replacement therapies
 <<if $hormoneUpgradePower == 0>>
 	are traditional: they're formulated to mimic natural hormones.
 	<<if $rep > 4000>>
-		[[Purchase data on advanced HRT|Dispensary][<<run cashX(forceNeg(25000*_PCSkillCheck), "capEx")>>, $hormoneUpgradePower = 1]]
+		[[Purchase data on advanced HRT|Dispensary][cashX(forceNeg(25000*_PCSkillCheck), "capEx"), $hormoneUpgradePower = 1]]
 		//Costs <<print cashFormat(25000*_PCSkillCheck)>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Should increase the power of hormone therapies.//
 		<br>
@@ -106,7 +106,7 @@ The hormone replacement therapies
 <<if $hormoneUpgradeShrinkage == 0>>
 	are broad-spectrum.
 	<<if $rep > 4000>>
-		[[Purchase data on targeted HRT|Dispensary][<<run cashX(forceNeg(25000*_PCSkillCheck), "capEx")>>, $hormoneUpgradeShrinkage = 1]]
+		[[Purchase data on targeted HRT|Dispensary][cashX(forceNeg(25000*_PCSkillCheck), "capEx"), $hormoneUpgradeShrinkage = 1]]
 		//Costs <<print cashFormat(25000*_PCSkillCheck)>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Should reduce atrophy of organs corresponding to original sex.//
 		<br>
@@ -124,7 +124,7 @@ The hormone replacement therapies
 		//You lack the reputation to fund forced puberty drugs//
 		<br>
 	<<elseif ($pubertyHormones == 0) && ($rep > 4500*_PCSkillCheck)>>
-		[[Fund research into powerful hormonal injections to jumpstart puberty|Dispensary][<<run cashX(forceNeg(30000*_PCSkillCheck), "capEx")>>, $pubertyHormones = 1]]
+		[[Fund research into powerful hormonal injections to jumpstart puberty|Dispensary][cashX(forceNeg(30000*_PCSkillCheck), "capEx"), $pubertyHormones = 1]]
 		//Costs <<print cashFormat(30000*_PCSkillCheck)>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the production of powerful hormonal drugs designed to force a slave through puberty without regard for side effects. //
 		<br>
@@ -142,7 +142,7 @@ Dietary Upgrades
 		//You lack the reputation to fund research into hermaphrodite hormones//
 		<br>
 	<<elseif ($dietXXY == 0) && ($rep > 3500*_PCSkillCheck)>>
-		[[Fund research into developing hermaphrodite hormone therapies|Dispensary][<<run cashX(forceNeg(10000*_PCSkillCheck), "capEx")>>, $dietXXY = 1]]
+		[[Fund research into developing hermaphrodite hormone therapies|Dispensary][cashX(forceNeg(10000*_PCSkillCheck), "capEx"), $dietXXY = 1]]
 		//Costs <<print cashFormat(10000*_PCSkillCheck)>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow for specially balanced meals to be served in the cafeteria designed to promote both halves of a herm's sexuality. //
 		<br>
@@ -161,7 +161,7 @@ Dietary Upgrades
 		//You lack the reputation to access breeders' dietary blends//
 		<br>
 	<<elseif ($reproductionFormula == 0) && ($rep > 10000*_PCSkillCheck)>>
-		[[Purchase reputable breeders' dietary blends|Dispensary][<<run cashX(forceNeg(25000*_PCSkillCheck), "capEx")>>, $reproductionFormula = 1]]
+		[[Purchase reputable breeders' dietary blends|Dispensary][cashX(forceNeg(25000*_PCSkillCheck), "capEx"), $reproductionFormula = 1]]
 		//Costs <<print cashFormat(25000*_PCSkillCheck)>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow for specially refined meals to be served in the cafeteria designed to promote energetic sperm and robust pregnancies. Side effects may include an increased number of twins being conceived.//
 		<br>
@@ -176,7 +176,7 @@ Dietary Upgrades
 <</if>>
 
 <<if $cumProDiet == 0>>
-	[[Purchase recipes to encourage cum production|Dispensary][<<run cashX(forceNeg(5000*_PCSkillCheck), "capEx")>>, $cumProDiet = 1]]
+	[[Purchase recipes to encourage cum production|Dispensary][cashX(forceNeg(5000*_PCSkillCheck), "capEx"), $cumProDiet = 1]]
 	//Costs <<print cashFormat(5000*_PCSkillCheck)>>//
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow for specially designed meals to be served in the cafeteria to promote cum production.//
 	<br>
@@ -187,7 +187,7 @@ Dietary Upgrades
 
 <<if $seePreg == 1>>
 	<<if $dietFertility != 1>>
-		[[Purchase recipes to encourage ovulation|Dispensary][<<run cashX(forceNeg(5000*_PCSkillCheck), "capEx")>>, $dietFertility = 1]]
+		[[Purchase recipes to encourage ovulation|Dispensary][cashX(forceNeg(5000*_PCSkillCheck), "capEx"), $dietFertility = 1]]
 		//Costs <<print cashFormat(5000*_PCSkillCheck)>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow for specially designed meals to be served in the cafeteria to promote slave fertility.//
 		<br>
@@ -198,7 +198,7 @@ Dietary Upgrades
 <</if>>
 
 <<if $dietCleanse == 0>>
-	[[Purchase cleansing recipes to lessen carcinogen buildup|Dispensary][<<run cashX(forceNeg(10000*_PCSkillCheck), "capEx")>>, $dietCleanse = 1]]
+	[[Purchase cleansing recipes to lessen carcinogen buildup|Dispensary][cashX(forceNeg(10000*_PCSkillCheck), "capEx"), $dietCleanse = 1]]
 	//Costs <<print cashFormat(10000*_PCSkillCheck)>>//
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow for specially designed meals to be served in the cafeteria to counteract excessive drug use.//
 	<br>
@@ -211,7 +211,7 @@ Dietary Upgrades
 Pharmacological Upgrades
 <hr>
 <<if ($curativeUpgrade == 0) && ($rep > 6000*_PCSkillCheck)>>
-	[[Purchase data on advanced curatives|Dispensary][<<run cashX(forceNeg(25000*_PCSkillCheck), "capEx")>>, $curativeUpgrade = 1]]
+	[[Purchase data on advanced curatives|Dispensary][cashX(forceNeg(25000*_PCSkillCheck), "capEx"), $curativeUpgrade = 1]]
 	//Costs <<print cashFormat(25000*_PCSkillCheck)>>//
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Should improve the effectiveness of curative treatment.//
 	<br>
@@ -221,7 +221,7 @@ Pharmacological Upgrades
 <</if>>
 
 <<if ($growthStim == 0) && ($rep > 6000*_PCSkillCheck)>>
-	[[Purchase data on growth stimulants|Dispensary][<<run cashX(forceNeg(20000*_PCSkillCheck), "capEx")>>, $growthStim = 1]]
+	[[Purchase data on growth stimulants|Dispensary][cashX(forceNeg(20000*_PCSkillCheck), "capEx"), $growthStim = 1]]
 	//Costs <<print cashFormat(20000*_PCSkillCheck)>>//
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the manufacturing of drugs to encourage growth in slave height.//
 	<br>
@@ -231,7 +231,7 @@ Pharmacological Upgrades
 <</if>>
 
 <<if ($aphrodisiacUpgradeRefine == 0) && ($rep > 6000*_PCSkillCheck)>>
-	[[Purchase data on refined aphrodisiacs|Dispensary][<<run cashX(forceNeg(20000*_PCSkillCheck), "capEx")>>, $aphrodisiacUpgradeRefine = 1]]
+	[[Purchase data on refined aphrodisiacs|Dispensary][cashX(forceNeg(20000*_PCSkillCheck), "capEx"), $aphrodisiacUpgradeRefine = 1]]
 	//Costs <<print cashFormat(20000*_PCSkillCheck)>>//
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will prevent most physical side effects of aphrodisiacs. Once the formulas are changed they cannot be changed back.//
 	<br>
@@ -241,7 +241,7 @@ Pharmacological Upgrades
 <</if>>
 
 <<if ($aphrodisiacUpgrade == 0) && ($rep > 6000*_PCSkillCheck)>>
-	[[Purchase data on aphrodisiac withdrawal treatment|Dispensary][<<run cashX(forceNeg(10000*_PCSkillCheck), "capEx")>>, $aphrodisiacUpgrade = 1]]
+	[[Purchase data on aphrodisiac withdrawal treatment|Dispensary][cashX(forceNeg(10000*_PCSkillCheck), "capEx"), $aphrodisiacUpgrade = 1]]
 	//Costs <<print cashFormat(10000*_PCSkillCheck)>>//
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Should prevent most negative effects of withdrawal.//
 	<br>
@@ -253,7 +253,7 @@ Pharmacological Upgrades
 <<if ($healthyDrugsUpgrade == 0)>>
 	<<if ($injectionUpgrade != 0) && ($curativeUpgrade == 1) && ($aphrodisiacUpgrade == 1)>>
 		<<if ($rep >= 15000*_PCSkillCheck)>>
-			[[Fund research into drug formulations without negative physical side effects|Dispensary][<<run cashX(forceNeg(500000*_PCSkillCheck), "capEx")>>,$healthyDrugsUpgrade = 1]]
+			[[Fund research into drug formulations without negative physical side effects|Dispensary][cashX(forceNeg(500000*_PCSkillCheck), "capEx"),$healthyDrugsUpgrade = 1]]
 			//Costs <<print cashFormat(500000*_PCSkillCheck)>>//
 			<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will prevent the negative side effects of excessive drug usage on your slaves.//
 			<br>
@@ -282,7 +282,7 @@ Fertility Focused Pharmacology
 <hr>
 <<if $seeHyperPreg == 1>>
 	<<if $superFertilityDrugs == 1 && ($rep > 10000*_PCSkillCheck) && $pregSpeedControl != 1>>
-		[[Fund research pregnancy speed control methods|Dispensary][<<run cashX(forceNeg(200000*_PCSkillCheck), "capEx")>>, $pregSpeedControl = 1, $clinicSpeedGestation = 0]]
+		[[Fund research pregnancy speed control methods|Dispensary][cashX(forceNeg(200000*_PCSkillCheck), "capEx"), $pregSpeedControl = 1, $clinicSpeedGestation = 0]]
 		//Costs <<print cashFormat(200000*_PCSkillCheck)>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;// Fund underground research labs to develop methods for controlling pregnancy progress. //
 		<br>
@@ -295,7 +295,7 @@ Fertility Focused Pharmacology
 	<</if>>
 <<elseif $birthsTotal > 10>>
 	<<if ($rep > 10000*_PCSkillCheck) && $pregSpeedControl != 1>>
-		[[Fund research pregnancy speed control methods|Dispensary][<<run cashX(forceNeg(200000*_PCSkillCheck), "capEx")>>, $pregSpeedControl = 1, $clinicSpeedGestation = 0]]
+		[[Fund research pregnancy speed control methods|Dispensary][cashX(forceNeg(200000*_PCSkillCheck), "capEx"), $pregSpeedControl = 1, $clinicSpeedGestation = 0]]
 		//Costs <<print cashFormat(200000*_PCSkillCheck)>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;// Fund underground research labs to develop methods for controlling pregnancy progress. //
 		<br>
@@ -312,7 +312,7 @@ Fertility Focused Pharmacology
 <</if>>
 
 <<if ($superFertilityDrugs == 0) && ($rep > 2500*_PCSkillCheck) && $seeHyperPreg == 1>>
-	[[Purchase data on powerful fertility drugs|Dispensary][<<run cashX(forceNeg(20000*_PCSkillCheck), "capEx")>>, $superFertilityDrugs = 1]]
+	[[Purchase data on powerful fertility drugs|Dispensary][cashX(forceNeg(20000*_PCSkillCheck), "capEx"), $superFertilityDrugs = 1]]
 	//Costs <<print cashFormat(20000*_PCSkillCheck)>>//
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Should improve the likelihood of conception and multiples. //
 	<br>
@@ -331,7 +331,7 @@ Future Societies Research
 		//You lack the reputation to access experimental gigantic implants and elasticizing filler.//
 		<br>
 	<<elseif ($arcologies[0].FSTransformationFetishistResearch == 0)>>
-		[[Purchase data on gigantic implants and elasticizing filler|Dispensary][<<run cashX(forceNeg(20000*_PCSkillCheck), "capEx")>>, $arcologies[0].FSTransformationFetishistResearch = 1]]
+		[[Purchase data on gigantic implants and elasticizing filler|Dispensary][cashX(forceNeg(20000*_PCSkillCheck), "capEx"), $arcologies[0].FSTransformationFetishistResearch = 1]]
 		//Costs <<print cashFormat(20000*_PCSkillCheck)>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the fabrication of gigantic implants using the autosurgery and filler capable of overfilling existing fillable implants.//
 		<br>
@@ -350,7 +350,7 @@ Future Societies Research
 <<if $arcologies[0].FSAssetExpansionistDecoration == 100>>
 	<<if ($arcologies[0].FSAssetExpansionistResearch == 0)>>
 		<<if ($rep >= 5000*_PCSkillCheck)>>
-			[[Fund research into drug formulations for growth without limit|Dispensary][<<run cashX(forceNeg(30000*_PCSkillCheck), "capEx")>>,$arcologies[0].FSAssetExpansionistResearch = 1]] //Costs <<print cashFormat(30000*_PCSkillCheck)>>. Will allow creation of drugs to push assets to unthinkable sizes.//
+			[[Fund research into drug formulations for growth without limit|Dispensary][cashX(forceNeg(30000*_PCSkillCheck), "capEx"),$arcologies[0].FSAssetExpansionistResearch = 1]] //Costs <<print cashFormat(30000*_PCSkillCheck)>>. Will allow creation of drugs to push assets to unthinkable sizes.//
 			<br>
 		<<else>>
 			// You lack the reputation to access the research necessary to develop advanced growth drug formulations. //
@@ -371,7 +371,7 @@ Future Societies Research
 <<if $arcologies[0].FSSlimnessEnthusiastDecoration == 100>>
 	<<if ($arcologies[0].FSSlimnessEnthusiastResearch == 0)>>
 		<<if ($rep >= 5000*_PCSkillCheck)>>
-			[[Fund research into drug formulations for slimming slaves|Dispensary][<<run cashX(forceNeg(30000*_PCSkillCheck), "capEx")>>,$arcologies[0].FSSlimnessEnthusiastResearch = 1]] //Costs <<print cashFormat(30000*_PCSkillCheck)>>. Will allow creation of drugs to shrink assets.//
+			[[Fund research into drug formulations for slimming slaves|Dispensary][cashX(forceNeg(30000*_PCSkillCheck), "capEx"),$arcologies[0].FSSlimnessEnthusiastResearch = 1]] //Costs <<print cashFormat(30000*_PCSkillCheck)>>. Will allow creation of drugs to shrink assets.//
 			<br>
 		<<else>>
 			// You lack the reputation to access the research necessary to develop asset reducing drug formulations. //
@@ -392,7 +392,7 @@ Future Societies Research
 <<if $arcologies[0].FSYouthPreferentialistDecoration == 100>>
 	<<if ($arcologies[0].FSYouthPreferentialistResearch == 0)>>
 		<<if ($rep >= 5000*_PCSkillCheck)>>
-			[[Fund research into skin care designed to reverse the effects of aging|Dispensary][<<run cashX(forceNeg(30000*_PCSkillCheck), "capEx")>>,$arcologies[0].FSYouthPreferentialistResearch = 1]] //Costs <<print cashFormat(30000*_PCSkillCheck)>>. Will allow creation of beauty creams designed to make slaves look young again.//
+			[[Fund research into skin care designed to reverse the effects of aging|Dispensary][cashX(forceNeg(30000*_PCSkillCheck), "capEx"),$arcologies[0].FSYouthPreferentialistResearch = 1]] //Costs <<print cashFormat(30000*_PCSkillCheck)>>. Will allow creation of beauty creams designed to make slaves look young again.//
 			<br>
 		<<else>>
 			// You lack the reputation to access the research necessary to develop beauty creams designed to make slaves look young again. //
@@ -413,7 +413,7 @@ Future Societies Research
 <<if $arcologies[0].FSHedonisticDecadenceDecoration == 100>>
 	<<if ($arcologies[0].FSHedonisticDecadenceResearch == 0)>>
 		<<if ($rep >= 5000*_PCSkillCheck)>>
-			[[Purchase recipes for concentrated, shaped slave food|Dispensary][<<run cashX(forceNeg(50000*_PCSkillCheck), "capEx")>>,$arcologies[0].FSHedonisticDecadenceResearch = 1]] //Costs <<print cashFormat(50000*_PCSkillCheck)>>. Will allow production of solid slave food in various familiar shapes and flavors. Addictive and a little fatty.<<if $arcologies[0].FSDegradationist != "unset">> Since your slaves don't deserve luxuries, a modified recipe formulated to cause severe stomach cramps minutes after ingestion will be developed.<</if>> //
+			[[Purchase recipes for concentrated, shaped slave food|Dispensary][cashX(forceNeg(50000*_PCSkillCheck), "capEx"),$arcologies[0].FSHedonisticDecadenceResearch = 1]] //Costs <<print cashFormat(50000*_PCSkillCheck)>>. Will allow production of solid slave food in various familiar shapes and flavors. Addictive and a little fatty.<<if $arcologies[0].FSDegradationist != "unset">> Since your slaves don't deserve luxuries, a modified recipe formulated to cause severe stomach cramps minutes after ingestion will be developed.<</if>> //
 			<br>
 		<<else>>
 			// You lack the reputation to access the research necessary to purchase concentrated, shaped slave food recipes. //
@@ -423,7 +423,7 @@ Future Societies Research
 		The fabricator has been upgraded to manufacture tasty, extremely addictive, solid slave food in various familiar shapes and flavors. While they look and taste like real food, their consistency is all wrong. Slaves gorging on them are likely to experience steady weight gain.<<if $arcologies[0].FSDegradationist != "unset">> Since your slaves don't deserve luxuries, all food crafted will cause severe stomach cramps minutes after ingestion. Coupled with their addictive nature, it ought to be quite torturous.<</if>>
 		<<if $arcologies[0].FSSlimnessEnthusiast > 50 && $arcologies[0].FSHedonisticDecadenceDietResearch == 0>>
 			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			[[Purchase diet recipes|Dispensary][<<run cashX(forceNeg(10000*_PCSkillCheck), "capEx")>>,$arcologies[0].FSHedonisticDecadenceDietResearch = 1]]
+			[[Purchase diet recipes|Dispensary][cashX(forceNeg(10000*_PCSkillCheck), "capEx"),$arcologies[0].FSHedonisticDecadenceDietResearch = 1]]
 			//Costs <<print cashFormat(10000*_PCSkillCheck)>>//
 			<br>&nbsp;&nbsp;&nbsp;&nbsp;
 			Will prevent rampant weight gain from ruining your slim slaves.
@@ -437,7 +437,7 @@ Future Societies Research
 	The fabricator has been upgraded to manufacture tasty, extremely addictive, solid slave food in various familiar shapes and flavors. While they look and taste like real food, their consistency is all wrong. Slaves gorging on them are likely to experience steady weight gain.<<if $arcologies[0].FSDegradationist != "unset">> Since your slaves don't deserve luxuries, all food crafted will cause severe stomach cramps minutes after ingestion. Coupled with their addictive nature, it ought to be quite torturous.<</if>>
 	<<if $arcologies[0].FSHedonisticDecadenceDietResearch == 0>>
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;
-		[[Purchase diet recipes|Dispensary][<<run cashX(forceNeg(10000*_PCSkillCheck), "capEx")>>,$arcologies[0].FSHedonisticDecadenceDietResearch = 1]]
+		[[Purchase diet recipes|Dispensary][cashX(forceNeg(10000*_PCSkillCheck), "capEx"),$arcologies[0].FSHedonisticDecadenceDietResearch = 1]]
 		//Costs <<print cashFormat(10000*_PCSkillCheck)>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 		Will prevent rampant unwanted weight gain from ruining your <<if $arcologies[0].FSSlimnessEnthusiast > 20>>slim <</if>>slaves.
diff --git a/src/uncategorized/managePenthouse.tw b/src/uncategorized/managePenthouse.tw
index 2d14acb3fc2..fb6d311c372 100644
--- a/src/uncategorized/managePenthouse.tw
+++ b/src/uncategorized/managePenthouse.tw
@@ -223,7 +223,7 @@ __Penthouse Upgrades__
 <<if $boobAccessibility > 0 || $pregAccessibility > 0 || $dickAccessibility > 0 || $ballsAccessibility > 0 || $buttAccessibility > 0>>
 <<set _removeCost = Math.trunc(((5000*($boobAccessibility+$pregAccessibility+$dickAccessibility+$ballsAccessibility+$buttAccessibility)))*$upgradeMultiplierArcology)>>
 <br>
-//[[Remove the accessibility renovations|Manage Penthouse][<<run cashX(forceNeg(_removeCost), "capEx")>>, $boobAccessibility = 0, $pregAccessibility = 0, $dickAccessibility = 0, $ballsAccessibility = 0, $buttAccessibility = 0]] Will cost <<print cashFormat(_removeCost)>>//
+//[[Remove the accessibility renovations|Manage Penthouse][cashX(forceNeg(_removeCost), "capEx"), $boobAccessibility = 0, $pregAccessibility = 0, $dickAccessibility = 0, $ballsAccessibility = 0, $buttAccessibility = 0]] Will cost <<print cashFormat(_removeCost)>>//
 <</if>>
 
 <</if>>
diff --git a/src/uncategorized/newGamePlus.tw b/src/uncategorized/newGamePlus.tw
index 5e737e2d58a..224ad3c3b52 100644
--- a/src/uncategorized/newGamePlus.tw
+++ b/src/uncategorized/newGamePlus.tw
@@ -14,7 +14,7 @@ You have decided to start over and will be able to take a few things with you: a
 You <<if $cash >= _fee>>have<<else>>lack<</if>> the funds to bring more than $slavesToImportMax slaves with you (or your equivalent) to a new arcology. It will cost @@.yellowgreen;<<print cashFormat(_fee)>>@@ to insure another slave's safe transfer.
 <<if $cash >= _fee>>
 	You have @@.yellowgreen;<<print cashFormat($cash)>>@@ to spend.
-	<br>[[Increase slave import capacity by 1.|New Game Plus][<<run cashX(forceNeg(_fee), "capEx")>>, $slavesToImportMax++]]
+	<br>[[Increase slave import capacity by 1.|New Game Plus][cashX(forceNeg(_fee), "capEx"), $slavesToImportMax++]]
 <</if>>
 
 <br>
-- 
GitLab