diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index 997e4b8c0a4ea3cac841982dbfe3574d601c2075..589042c7b401390c0d23eddcbe577dca8e3a773e 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -1,5 +1,5 @@
 :: Incubator [nobr]
- 
+<<HSM>>
 <<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Incubator">>
 <<set $targetAge = Number($targetAge) || $minimumSlaveAge>>
 <<set $targetAge = Math.clamp($targetAge, $minimumSlaveAge, 42)>>
@@ -22,11 +22,11 @@ $incubatorNameCaps is a clean, cold hall designed to be lined with tanks and the
 <</if>>
 
 <br>It can support $incubator <<if $incubator == 1>>child<<else>>children<</if>>. Currently $incubatorSlaves tanks are in use.
-[[Add another incubation tank|Incubator][$cash -= Math.trunc(60000*$upgradeMultiplierArcology), $incubator += 1]] //Costs <<print cashFormat(Math.trunc(60000*$upgradeMultiplierArcology))>> and will increase upkeep costs//
+[[Add another incubation tank|Incubator][$cash -= Math.trunc(60000*$upgradeMultiplierArcology*$HackingSkillMultiplier), $incubator += 1]] //Costs <<print cashFormat(Math.trunc(60000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>> and will increase upkeep costs//
 <<if $freeTanks == 0>>
 	All of the tanks are currently occupied by growing children.
 <<elseif $incubator > 1 && $reservedChildren < $freeTanks>>
-	[[Remove an incubation tank|Incubator][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $incubator -= 1]] //Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>> and will reduce upkeep costs//
+	[[Remove an incubation tank|Incubator][$cash -= Math.trunc(10000*$upgradeMultiplierArcology*$HackingSkillMultiplier), $incubator -= 1]] //Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>> and will reduce upkeep costs//
 <</if>>
 
 <br><br>
@@ -179,41 +179,41 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
 <<if $incubatorUpgradeSpeed == 52>>
 	It has been upgraded with perfected growth accelerants; children grow at the rate of 1 week to 1 year.
 <<elseif $incubatorUpgradeSpeed == 18>>
-	It has been upgraded with advanced experimental growth accelerants; children grow at the rate of 3 weeks to 1 year. [[Fund speculative research into maximizing growth rate|Incubator][$cash -= Math.trunc(500000*$upgradeMultiplierArcology), $incubatorUpgradeSpeed = 52]] //Costs <<print cashFormat(Math.trunc(500000*$upgradeMultiplierArcology))>> and will increase upkeep costs//
+	It has been upgraded with advanced experimental growth accelerants; children grow at the rate of 3 weeks to 1 year. [[Fund speculative research into maximizing growth rate|Incubator][$cash -= Math.trunc(500000*$upgradeMultiplierArcology*$HackingSkillMultiplier), $incubatorUpgradeSpeed = 52]] //Costs <<print cashFormat(Math.trunc(500000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>> and will increase upkeep costs//
 <<elseif $incubatorUpgradeSpeed == 9>>
-	It has been upgraded with advanced growth accelerants; children grow at the rate of 6 weeks to 1 year. [[Fund research into increasing growth rate even further|Incubator][$cash -= Math.trunc(75000*$upgradeMultiplierArcology), $incubatorUpgradeSpeed = 18]] //Costs <<print cashFormat(Math.trunc(75000*$upgradeMultiplierArcology))>> and will increase upkeep costs//
+	It has been upgraded with advanced growth accelerants; children grow at the rate of 6 weeks to 1 year. [[Fund research into increasing growth rate even further|Incubator][$cash -= Math.trunc(75000*$upgradeMultiplierArcology*$HackingSkillMultiplier), $incubatorUpgradeSpeed = 18]] //Costs <<print cashFormat(Math.trunc(75000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>> and will increase upkeep costs//
 <<elseif $incubatorUpgradeSpeed == 6>>
-	It has been upgraded with growth accelerants; children grow at the rate of 9 weeks to 1 year. [[Further upgrade the incubators with specialized stem cells to speed growth|Incubator][$cash -= Math.trunc(30000*$upgradeMultiplierArcology), $incubatorUpgradeSpeed = 9]] //Costs <<print cashFormat(Math.trunc(30000*$upgradeMultiplierArcology))>> and will increase upkeep costs//
+	It has been upgraded with growth accelerants; children grow at the rate of 9 weeks to 1 year. [[Further upgrade the incubators with specialized stem cells to speed growth|Incubator][$cash -= Math.trunc(30000*$upgradeMultiplierArcology*$HackingSkillMultiplier), $incubatorUpgradeSpeed = 9]] //Costs <<print cashFormat(Math.trunc(30000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>> and will increase upkeep costs//
 <<elseif $incubatorUpgradeSpeed == 5>>
-	The incubation tanks are basic; children grow at the rate of 12 weeks to 1 year. [[Upgrade the incubators with growth accelerating drugs|Incubator][$cash -= Math.trunc(30000*$upgradeMultiplierArcology), $incubatorUpgradeSpeed = 6]] //Costs <<print cashFormat(Math.trunc(30000*$upgradeMultiplierArcology))>> and will increase upkeep costs//
+	The incubation tanks are basic; children grow at the rate of 12 weeks to 1 year. [[Upgrade the incubators with growth accelerating drugs|Incubator][$cash -= Math.trunc(30000*$upgradeMultiplierArcology*$HackingSkillMultiplier), $incubatorUpgradeSpeed = 6]] //Costs <<print cashFormat(Math.trunc(30000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>> and will increase upkeep costs//
 <</if>>
 
 <br>
 <<if $incubatorUpgradeWeight == 1>>
 	Advanced caloric monitoring systems have been installed in the tanks to monitor and maintain a developing child's weight.
 <<else>>
-	There are no systems in place to control a growing child's weight; they will likely come out emaciated from rapidly growing. [[Upgrade the growth tanks with weight monitoring systems|Incubator][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $incubatorUpgradeWeight = 1]] //Costs <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>> and will increase upkeep costs//
+	There are no systems in place to control a growing child's weight; they will likely come out emaciated from rapidly growing. [[Upgrade the growth tanks with weight monitoring systems|Incubator][$cash -= Math.trunc(20000*$upgradeMultiplierArcology*$HackingSkillMultiplier), $incubatorUpgradeWeight = 1]] //Costs <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>> and will increase upkeep costs//
 <</if>>
 
 <br>
 <<if $incubatorUpgradeMuscles == 1>>
 	Advanced monitoring and steroid injection systems have been installed in the tanks to monitor and maintain a developing child's musculature.
 <<else>>
-	There are no systems in place to control a growing child's musculature; they will likely come out frail and weak from rapidly growing. [[Upgrade the growth tanks with muscle monitoring systems|Incubator][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $incubatorUpgradeMuscles = 1]] //Costs <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>> and will increase upkeep costs//
+	There are no systems in place to control a growing child's musculature; they will likely come out frail and weak from rapidly growing. [[Upgrade the growth tanks with muscle monitoring systems|Incubator][$cash -= Math.trunc(20000*$upgradeMultiplierArcology*$HackingSkillMultiplier), $incubatorUpgradeMuscles = 1]] //Costs <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>> and will increase upkeep costs//
 <</if>>
 
 <br>
 <<if $incubatorUpgradeReproduction == 1>>
 	Advanced monitoring and hormone injection systems have been installed in the tanks to influence a developing child's reproductive organs.
 <<else>>
-	There are no systems in place to control a growing child's reproductive capability. [[Upgrade the growth tanks with hormone monitoring systems|Incubator][$cash -= Math.trunc(50000*$upgradeMultiplierArcology), $incubatorUpgradeReproduction = 1]] //Costs <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>> and will increase upkeep costs//
+	There are no systems in place to control a growing child's reproductive capability. [[Upgrade the growth tanks with hormone monitoring systems|Incubator][$cash -= Math.trunc(50000*$upgradeMultiplierArcology*$HackingSkillMultiplier), $incubatorUpgradeReproduction = 1]] //Costs <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>> and will increase upkeep costs//
 <</if>>
 
 <br>
 <<if $incubatorUpgradeOrgans == 1>>
 	Surgical tools have been added to the tank to be able to extract tissue samples from the occupant.
 <<elseif $organFarmUpgrade >= 1>>
-	The tanks lack the ability to extract tissue samples to be used by the organ fabricator. [[Upgrade the growth tanks with surgical extraction tools|Incubator][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $incubatorUpgradeOrgans = 1]] //Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>> and will increase upkeep costs//
+	The tanks lack the ability to extract tissue samples to be used by the organ fabricator. [[Upgrade the growth tanks with surgical extraction tools|Incubator][$cash -= Math.trunc(10000*$upgradeMultiplierArcology*$HackingSkillMultiplier), $incubatorUpgradeOrgans = 1]] //Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>> and will increase upkeep costs//
 <<else>>
 	The tanks lack the ability to extract tissue samples and the dispensary lacks the ability to make use of them to fabricate organs.
 <</if>>
@@ -222,7 +222,7 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
 <<if $incubatorUpgradeGrowthStims == 1>>
 	Advanced monitoring and stimulant injection systems have been installed in the tanks to monitor and maintain a developing child's height.
 <<elseif $growthStim == 1>>
-	There are no systems in place to control a growing child's height. [[Upgrade the growth tanks with stimulants injection systems|Incubator][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $incubatorUpgradeGrowthStims = 1]] //Costs <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>> and will increase upkeep costs//
+	There are no systems in place to control a growing child's height. [[Upgrade the growth tanks with stimulants injection systems|Incubator][$cash -= Math.trunc(20000*$upgradeMultiplierArcology*$HackingSkillMultiplier), $incubatorUpgradeGrowthStims = 1]] //Costs <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>> and will increase upkeep costs//
 <<else>>
 	There are no systems in place to control a growing child's height and you lack the capability to fabricate growth stimulants.
 <</if>>
diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw
index 5ee145e056854558e41dc6fd14750f281941d7d7..b4a351e49b25cb2c4f5e399bb4272641863be60f 100644
--- a/src/uncategorized/dispensary.tw
+++ b/src/uncategorized/dispensary.tw
@@ -1,5 +1,5 @@
 :: Dispensary [nobr]
-
+<<HSM>>
 <<set $nextButton = "Back", $nextLink = "Manage Penthouse", $showEncyclopedia = 1, $encyclopedia = "The Pharmaceutical Fab.">>
 
 <br>
@@ -15,8 +15,8 @@ The Dispensary
 
 <<if ($dispensaryUpgrade == 0)>>
 	<<if ($rep > 5000)>>
-		[[Upgrade the pharmaceutical fabricator|Dispensary][$cash -= Math.trunc(30000*$upgradeMultiplierArcology), $dispensaryUpgrade = 1, $drugsCost = (($drugsCost*2)/3)]]
-		//Costs <<print cashFormat(Math.trunc(30000*$upgradeMultiplierArcology))>>//
+		[[Upgrade the pharmaceutical fabricator|Dispensary][$cash -= Math.trunc(30000*$upgradeMultiplierArcology*$HackingSkillMultiplier), $dispensaryUpgrade = 1, $drugsCost = (($drugsCost*2)/3)]]
+		//Costs <<print cashFormat(Math.trunc(30000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will improve production efficiency further decreasing costs.//
 		<br>
 	<<else>>
@@ -38,18 +38,18 @@ The Organ Farm
 	//The organ farm can not be upgraded while it is use//
 	<br>
 <<elseif ($organFarmUpgrade == 2) && ($rep > 10000*$upgradeMultiplierMedicine)>>
-	[[Upgrade to the organ farm to the cutting edge model|Dispensary][$cash -= 150000*$upgradeMultiplierMedicine, $organFarmUpgrade = 3]]
-	//Costs <<print cashFormat(150000*$upgradeMultiplierMedicine)>>//
+	[[Upgrade to the organ farm to the cutting edge model|Dispensary][$cash -= 150000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $organFarmUpgrade = 3]]
+	//Costs <<print cashFormat(150000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>//
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the organ farm to rapidly grow organs without risk to the implantee's health.//
 	<br>
 <<elseif ($organFarmUpgrade == 1) && ($rep > 10000*$upgradeMultiplierMedicine)>>
-	[[Upgrade the organ farm with an experimental growth accelerator|Dispensary][$cash -= 50000*$upgradeMultiplierMedicine, $organFarmUpgrade = 2]]
-	//Costs <<print cashFormat(50000*$upgradeMultiplierMedicine)>>//
+	[[Upgrade the organ farm with an experimental growth accelerator|Dispensary][$cash -= 50000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $organFarmUpgrade = 2]]
+	//Costs <<print cashFormat(50000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>//
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the organ farm to quickly grow organs. Implanted organs may cause health issues.//
 	<br>
 <<elseif ($organFarmUpgrade == 0) && ($rep > 10000*$upgradeMultiplierMedicine)>>
-	[[Upgrade the fabricator with an experimental organ farm|Dispensary][$cash -= 50000*$upgradeMultiplierMedicine, $organFarmUpgrade = 1]]
-	//Costs <<print cashFormat(50000*$upgradeMultiplierMedicine)>>//
+	[[Upgrade the fabricator with an experimental organ farm|Dispensary][$cash -= 50000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $organFarmUpgrade = 1]]
+	//Costs <<print cashFormat(50000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>//
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the fabrication of tailored organs using the autosurgery.//
 	<br>
 <</if>>
@@ -127,8 +127,8 @@ The fabricator is producing
 <<if $injectionUpgrade == 0>>
 	standard growth hormones.
 	<<if $rep > 6000>>
-		[[Purchase data on prototype growth hormone tests|Dispensary][$cash -= 25000*$upgradeMultiplierMedicine, $injectionUpgrade = 1]]
-		//Costs <<print cashFormat(25000*$upgradeMultiplierMedicine)>>//
+		[[Purchase data on prototype growth hormone tests|Dispensary][$cash -= 25000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $injectionUpgrade = 1]]
+		//Costs <<print cashFormat(25000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Should improve the reliability of growth injections of all kinds.//
 		<br>
 	<<else>>
@@ -138,8 +138,8 @@ The fabricator is producing
 <<elseif $injectionUpgrade == 1>>
 	prototype growth hormones.
 	<<if $rep > 10000>>
-		[[Upgrade the fabricator to customize each slave's growth hormones|Dispensary][$cash -= 50000*$upgradeMultiplierMedicine, $injectionUpgrade = 2]]
-		//Costs <<print cashFormat(50000*$upgradeMultiplierMedicine)>>//
+		[[Upgrade the fabricator to customize each slave's growth hormones|Dispensary][$cash -= 50000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $injectionUpgrade = 2]]
+		//Costs <<print cashFormat(50000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Should improve the reliability of growth injections of all kinds.//
 	<<else>>
 		//You lack the reputation to obtain prototype fabricator upgrades//
@@ -147,8 +147,8 @@ The fabricator is producing
 <<elseif $injectionUpgrade == 2>>
 	prototype growth hormones.
 	<<if $rep > 14000>>
-		[[Upgrade the fabricator with prototype biomechanical microfactories|Dispensary][$cash -= 100000*$upgradeMultiplierMedicine, $injectionUpgrade = 3]]
-		//Costs <<print cashFormat(100000*$upgradeMultiplierMedicine)>>//
+		[[Upgrade the fabricator with prototype biomechanical microfactories|Dispensary][$cash -= 100000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $injectionUpgrade = 3]]
+		//Costs <<print cashFormat(100000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Should improve the reliability of growth injections of all kinds.//
 		<br>
 	<<else>>
@@ -164,8 +164,8 @@ The fabricator is producing
 <<if $hormoneUpgradeMood == 0>>
 	standardized hormone replacement therapies.
 	<<if $rep > 2000>>
-		[[Upgrade for individualized therapy|Dispensary][$cash -= 10000*$upgradeMultiplierMedicine, $hormoneUpgradeMood = 1]]
-		//Costs <<print cashFormat(10000*$upgradeMultiplierMedicine)>>//
+		[[Upgrade for individualized therapy|Dispensary][$cash -= 10000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $hormoneUpgradeMood = 1]]
+		//Costs <<print cashFormat(10000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Should eliminate the occasional moodiness and sexual disinterest caused by generalized therapy.//
 		<br>
 	<<else>>
@@ -181,8 +181,8 @@ 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][$cash -= 25000*$upgradeMultiplierMedicine, $hormoneUpgradePower = 1]]
-		//Costs <<print cashFormat(25000*$upgradeMultiplierMedicine)>>//
+		[[Purchase data on advanced HRT|Dispensary][$cash -= 25000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $hormoneUpgradePower = 1]]
+		//Costs <<print cashFormat(25000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Should increase the power of hormone therapies.//
 		<br>
 	<<else>>
@@ -198,8 +198,8 @@ The hormone replacement therapies
 <<if $hormoneUpgradeShrinkage == 0>>
 	are broad-spectrum.
 	<<if $rep > 4000>>
-		[[Purchase data on targeted HRT|Dispensary][$cash -= 25000*$upgradeMultiplierMedicine, $hormoneUpgradeShrinkage = 1]]
-		//Costs <<print cashFormat(25000*$upgradeMultiplierMedicine)>>//
+		[[Purchase data on targeted HRT|Dispensary][$cash -= 25000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $hormoneUpgradeShrinkage = 1]]
+		//Costs <<print cashFormat(25000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Should reduce atrophy of organs corresponding to original sex.//
 		<br>
 	<<else>>
@@ -216,8 +216,8 @@ The hormone replacement therapies
 		//You lack the reputation to fund forced puberty drugs//
 		<br>
 	<<elseif ($pubertyHormones == 0) && ($rep > 4500*$upgradeMultiplierMedicine)>>
-		[[Fund research into powerful hormonal injections to jumpstart puberty|Dispensary][$cash -= 30000*$upgradeMultiplierMedicine, $pubertyHormones = 1]]
-		//Costs <<print cashFormat(30000*$upgradeMultiplierMedicine)>>//
+		[[Fund research into powerful hormonal injections to jumpstart puberty|Dispensary][$cash -= 30000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $pubertyHormones = 1]]
+		//Costs <<print cashFormat(30000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>//
 		<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>
 	<<elseif ($pubertyHormones == 1)>>
@@ -234,8 +234,8 @@ Dietary Upgrades
 		//You lack the reputation to fund research into hermaphrodite hormones//
 		<br>
 	<<elseif ($dietXXY == 0) && ($rep > 3500*$upgradeMultiplierMedicine)>>
-		[[Fund research into developing hermaphrodite hormone therapies|Dispensary][$cash -= 10000*$upgradeMultiplierMedicine, $dietXXY = 1]]
-		//Costs <<print cashFormat(10000*$upgradeMultiplierMedicine)>>//
+		[[Fund research into developing hermaphrodite hormone therapies|Dispensary][$cash -= 10000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $dietXXY = 1]]
+		//Costs <<print cashFormat(10000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>//
 		<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>
 	<<elseif ($dietXXY == 1)>>
@@ -248,8 +248,8 @@ Dietary Upgrades
 <</if>>
 
 <<if $cumProDiet == 0>>
-	[[Purchase recipes to encourage cum production|Dispensary][$cash -= 5000*$upgradeMultiplierMedicine, $cumProDiet = 1]]
-	//Costs <<print cashFormat(5000*$upgradeMultiplierMedicine)>>//
+	[[Purchase recipes to encourage cum production|Dispensary][$cash -= 5000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $cumProDiet = 1]]
+	//Costs <<print cashFormat(5000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>//
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow for specially designed meals to be served in the cafeteria to promote cum production.//
 	<br>
 <<elseif $cumProDiet == 1>>
@@ -258,8 +258,8 @@ Dietary Upgrades
 <</if>>
 
 <<if $dietCleanse == 0>>
-	[[Purchase cleansing recipes to lessen genome damage|Dispensary][$cash -= 10000*$upgradeMultiplierMedicine, $dietCleanse = 1]]
-	//Costs <<print cashFormat(10000*$upgradeMultiplierMedicine)>>//
+	[[Purchase cleansing recipes to lessen genome damage|Dispensary][$cash -= 10000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $dietCleanse = 1]]
+	//Costs <<print cashFormat(10000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>//
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow for specially designed meals to be served in the cafeteria to counteract excessive drug use.//
 	<br>
 <<elseif $dietCleanse == 1>>
@@ -271,8 +271,8 @@ Dietary Upgrades
 Pharmacological Upgrades
 <hr>
 <<if ($curativeUpgrade == 0) && ($rep > 6000*$upgradeMultiplierMedicine)>>
-	[[Purchase data on advanced curatives|Dispensary][$cash -= 25000*$upgradeMultiplierMedicine, $curativeUpgrade = 1]]
-	//Costs <<print cashFormat(25000*$upgradeMultiplierMedicine)>>//
+	[[Purchase data on advanced curatives|Dispensary][$cash -= 25000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $curativeUpgrade = 1]]
+	//Costs <<print cashFormat(25000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>//
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Should improve the effectiveness of curative treatment.//
 	<br>
 <<elseif ($curativeUpgrade == 1)>>
@@ -281,8 +281,8 @@ Pharmacological Upgrades
 <</if>>
 
 <<if ($growthStim == 0) && ($rep > 6000*$upgradeMultiplierMedicine)>>
-	[[Purchase data on growth stimulants|Dispensary][$cash -= 20000*$upgradeMultiplierMedicine, $growthStim = 1]]
-	//Costs <<print cashFormat(20000*$upgradeMultiplierMedicine)>>//
+	[[Purchase data on growth stimulants|Dispensary][$cash -= 20000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $growthStim = 1]]
+	//Costs <<print cashFormat(20000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>//
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the manufacturing of drugs to encourage growth in slave height.//
 	<br>
 <<elseif ($growthStim == 1)>>
@@ -291,8 +291,8 @@ Pharmacological Upgrades
 <</if>>
 
 <<if ($aphrodisiacUpgradeRefine == 0) && ($rep > 6000*$upgradeMultiplierMedicine)>>
-	[[Purchase data on refined aphrodisiacs|Dispensary][$cash -= 20000*$upgradeMultiplierMedicine, $aphrodisiacUpgradeRefine = 1]]
-	//Costs <<print cashFormat(20000*$upgradeMultiplierMedicine)>>//
+	[[Purchase data on refined aphrodisiacs|Dispensary][$cash -= 20000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $aphrodisiacUpgradeRefine = 1]]
+	//Costs <<print cashFormat(20000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>//
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will prevent most physical side effects of aphrodisiacs. Once the formulas are changed they can not be changed back.//
 	<br>
 <<elseif ($aphrodisiacUpgradeRefine == 1)>>
@@ -301,8 +301,8 @@ Pharmacological Upgrades
 <</if>>
 
 <<if ($aphrodisiacUpgrade == 0) && ($rep > 6000*$upgradeMultiplierMedicine)>>
-	[[Purchase data on aphrodisiac withdrawal treatment|Dispensary][$cash -= 10000*$upgradeMultiplierMedicine, $aphrodisiacUpgrade = 1]]
-	//Costs <<print cashFormat(10000*$upgradeMultiplierMedicine)>>//
+	[[Purchase data on aphrodisiac withdrawal treatment|Dispensary][$cash -= 10000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $aphrodisiacUpgrade = 1]]
+	//Costs <<print cashFormat(10000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>//
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Should prevent most negative effects of withdrawal.//
 	<br>
 <<elseif ($aphrodisiacUpgrade == 1)>>
@@ -313,8 +313,8 @@ Pharmacological Upgrades
 <<if ($healthyDrugsUpgrade == 0)>>
 	<<if (($organFarmUpgrade >= 1) && ($injectionUpgrade != 0) && ($curativeUpgrade == 1) && ($aphrodisiacUpgrade == 1))>>
 		<<if ($rep >= 15000*$upgradeMultiplierMedicine)>>
-			[[Fund research into drug formulations without negative physical side effects|Dispensary][$cash -= 500000*$upgradeMultiplierMedicine,$healthyDrugsUpgrade = 1]]
-			//Costs <<print cashFormat(500000*$upgradeMultiplierMedicine)>>//
+			[[Fund research into drug formulations without negative physical side effects|Dispensary][$cash -= 500000*$upgradeMultiplierMedicine*$HackingSkillMultiplier,$healthyDrugsUpgrade = 1]]
+			//Costs <<print cashFormat(500000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>//
 			<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will prevent the negative side effects of excessive drug usage on your slaves.//
 			<br>
 		<<else>>
@@ -342,8 +342,8 @@ Fertility Focused Pharmacology
 <hr>
 <<if $seeHyperPreg == 1>>
 	<<if $superFertilityDrugs == 1 && ($rep > 10000*$upgradeMultiplierMedicine) && $pregSpeedControl != 1>>
-		[[Fund research pregnancy speed control methods|Dispensary][$cash -= 200000*$upgradeMultiplierMedicine, $pregSpeedControl = 1, $clinicSpeedGestation = 0]]
-		//Costs <<print cashFormat(200000*$upgradeMultiplierMedicine)>>//
+		[[Fund research pregnancy speed control methods|Dispensary][$cash -= 200000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $pregSpeedControl = 1, $clinicSpeedGestation = 0]]
+		//Costs <<print cashFormat(200000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;// Fund underground research labs to develop methods for controlling pregnancy progress. //
 		<br>
 	<<elseif ($rep <= 10000*$upgradeMultiplierMedicine) && $pregSpeedControl != 1>>
@@ -355,8 +355,8 @@ Fertility Focused Pharmacology
 	<</if>>
 <<elseif $birthsTotal > 10>>
 	<<if ($rep > 10000*$upgradeMultiplierMedicine) && $pregSpeedControl != 1>>
-		[[Fund research pregnancy speed control methods|Dispensary][$cash -= 200000*$upgradeMultiplierMedicine, $pregSpeedControl = 1, $clinicSpeedGestation = 0]]
-		//Costs <<print cashFormat(200000*$upgradeMultiplierMedicine)>>//
+		[[Fund research pregnancy speed control methods|Dispensary][$cash -= 200000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $pregSpeedControl = 1, $clinicSpeedGestation = 0]]
+		//Costs <<print cashFormat(200000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;// Fund underground research labs to develop methods for controlling pregnancy progress. //
 		<br>
 	<<elseif ($rep <= 10000*$upgradeMultiplierMedicine) && $pregSpeedControl != 1>>
@@ -372,8 +372,8 @@ Fertility Focused Pharmacology
 <</if>>
 
 <<if ($superFertilityDrugs == 0) && ($rep > 2500*$upgradeMultiplierMedicine) && $seeHyperPreg == 1>>
-	[[Purchase data on powerful fertility drugs|Dispensary][$cash -= 20000*$upgradeMultiplierMedicine, $superFertilityDrugs = 1]]
-	//Costs <<print cashFormat(20000*$upgradeMultiplierMedicine)>>//
+	[[Purchase data on powerful fertility drugs|Dispensary][$cash -= 20000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $superFertilityDrugs = 1]]
+	//Costs <<print cashFormat(20000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>//
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Should improve the likelihood of conception and multiples. //
 	<br>
 <<elseif ($superFertilityDrugs == 1)>>
@@ -391,8 +391,8 @@ Implant Production
 <</if>>
 
 <<if ($ImplantProductionUpgrade == 0) && ($rep > 2000*$upgradeMultiplierMedicine)>>
-    [[Upgrade the fabricator with an experimental implant manufacturer|Dispensary][$cash -= 20000*$upgradeMultiplierMedicine, $ImplantProductionUpgrade = 1]]
-	//Costs <<print cashFormat(20000*$upgradeMultiplierMedicine)>>//
+    [[Upgrade the fabricator with an experimental implant manufacturer|Dispensary][$cash -= 20000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $ImplantProductionUpgrade = 1]]
+	//Costs <<print cashFormat(20000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>//
     <br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the fabrication of special implants using the autosurgery.//
 	<br>
 <<elseif ($ImplantProductionUpgrade > 0)>>
@@ -406,8 +406,8 @@ Implant Production
 		<br>
 	<</if>>
 	<<if ($permaPregImplant == 0) && ($rep > 4000*$upgradeMultiplierMedicine)>>
-		[[Purchase schematics for an experimental implantable pregnancy generator|Dispensary][$cash -= 30000*$upgradeMultiplierMedicine, $permaPregImplant = 1]]
-		//Costs <<print cashFormat(30000*$upgradeMultiplierMedicine)>>//
+		[[Purchase schematics for an experimental implantable pregnancy generator|Dispensary][$cash -= 30000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $permaPregImplant = 1]]
+		//Costs <<print cashFormat(30000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the fabrication of implants that force perpetual pregnancy.//
 		<br>
 	<<elseif ($permaPregImplant > 0)>>
@@ -417,14 +417,14 @@ Implant Production
 <</if>>
 
 <<if $ImplantProductionUpgrade == 1>>
-	<<if ($bellyImplants == 0) && ($rep <= 2000*$upgradeMultiplierMedicine)>>
+	<<if ($bellyImplants == 0) && ($rep <= 2000*$upgradeMultiplierMedicine*)>>
 		//You lack the reputation to access experimental fillable abdominal implants//
 		<br>
 	<</if>>
 
 	<<if ($bellyImplants == 0) && ($rep > 2000*$upgradeMultiplierMedicine)>>
-		[[Purchase schematics for fillable abdominal implants|Dispensary][$cash -= 20000*$upgradeMultiplierMedicine, $bellyImplants = 1]]
-		//Costs <<print cashFormat(20000*$upgradeMultiplierMedicine)>>//
+		[[Purchase schematics for fillable abdominal implants|Dispensary][$cash -= 20000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $bellyImplants = 1]]
+		//Costs <<print cashFormat(20000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the fabrication of fillable abdominal implants using the autosurgery.//
 		<br>
 	<<elseif ($bellyImplants > 0)>>
@@ -438,8 +438,8 @@ Implant Production
 	<</if>>
 
 	<<if ($bellyImplants == 1) && ($cervixImplants != 1) && ($rep >6000*$upgradeMultiplierMedicine)>> /* nanotech like technology much more impressive and costly than simple implant */
-		[[Purchase schematics for cervix filter micropumps|Dispensary][$cash -= 70000*$upgradeMultiplierMedicine, $cervixImplants = 1]]
-		//Costs <<print cashFormat(70000*$upgradeMultiplierMedicine)>>// 
+		[[Purchase schematics for cervix filter micropumps|Dispensary][$cash -= 70000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $cervixImplants = 1]]
+		//Costs <<print cashFormat(70000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>// 
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the fabrication of cervix filter micropumps for fillable abdominal implants using the autosurgery.//
 		<br>
 	<<elseif ($cervixImplants > 0)>>
@@ -452,8 +452,8 @@ Implant Production
 		<br>
 	<</if>>
 	<<if ($prostateImplants != 1) && ($rep > 3000*$upgradeMultiplierMedicine)>>
-		[[Purchase plans for ejaculation enhancing prostate implants|Dispensary][$cash -= 30000*$upgradeMultiplierMedicine, $prostateImplants = 1]]
-		//Costs <<print cashFormat(30000*$upgradeMultiplierMedicine)>>// 
+		[[Purchase plans for ejaculation enhancing prostate implants|Dispensary][$cash -= 30000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $prostateImplants = 1]]
+		//Costs <<print cashFormat(30000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>// 
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the fabrication of a prostate implant designed to stimulate fluid production for massive ejaculations. Beware of leaking and dehydration.//
 		<br>
 	<<elseif ($prostateImplants > 0)>>
@@ -466,8 +466,8 @@ Implant Production
 		
 	<</if>>
 	<<if ($meshImplants != 1) && ($rep > 10000*$upgradeMultiplierMedicine)>>
-		[[Purchase plans for supportive mesh breast implants|Dispensary][$cash -= 40000*$upgradeMultiplierMedicine, $meshImplants = 1]]
-		//Costs <<print cashFormat(40000*$upgradeMultiplierMedicine)>>// 
+		[[Purchase plans for supportive mesh breast implants|Dispensary][$cash -= 40000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $meshImplants = 1]]
+		//Costs <<print cashFormat(40000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>// 
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the fabrication of an organic, supportive mesh breast implants.//
 		<br>
 	<<elseif ($meshImplants > 0)>>
@@ -485,7 +485,7 @@ Future Societies Research
 <<if $arcologies[0].FSGenderRadicalistDecoration == 100 && $organFarmUpgrade > 0>>
 	<<if ($arcologies[0].FSGenderRadicalistResearch == 0)>>
 		<<if ($rep >= 10000*$upgradeMultiplierMedicine)>>
-			[[Fund research into developing male pregnancy methods|Dispensary][$cash -= 50000*$upgradeMultiplierMedicine,$arcologies[0].FSGenderRadicalistResearch = 1]] //Costs <<print cashFormat(50000*$upgradeMultiplierMedicine)>>. Will allow cloning and production of anal uteri and ovaries.//
+			[[Fund research into developing male pregnancy methods|Dispensary][$cash -= 50000*$upgradeMultiplierMedicine*$HackingSkillMultiplier,$arcologies[0].FSGenderRadicalistResearch = 1]] //Costs <<print cashFormat(50000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>. Will allow cloning and production of anal uteri and ovaries.//
 			<br>
 		<<else>>
 			// You lack the reputation to access the research necessary to develop anal uteri and ovaries. //
@@ -509,8 +509,8 @@ 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][$cash -= 20000*$upgradeMultiplierMedicine, $arcologies[0].FSTransformationFetishistResearch = 1]]
-		//Costs <<print cashFormat(20000*$upgradeMultiplierMedicine)>>//
+		[[Purchase data on gigantic implants and elasticizing filler|Dispensary][$cash -= 20000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $arcologies[0].FSTransformationFetishistResearch = 1]]
+		//Costs <<print cashFormat(20000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>//
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the fabrication of gigantic implants using the autosurgery and filler capable of overfilling existing fillable implants.//
 		<br>
 	<<elseif ($arcologies[0].FSTransformationFetishistResearch > 0)>>
diff --git a/src/uncategorized/managePenthouse.tw b/src/uncategorized/managePenthouse.tw
index cca507e9b3b7dda27859724c1d660b602e4947c9..a6df17e6aa4d821970f507ca523ea512ccac9c8a 100644
--- a/src/uncategorized/managePenthouse.tw
+++ b/src/uncategorized/managePenthouse.tw
@@ -1,5 +1,5 @@
 :: Manage Penthouse [nobr]
-
+<<HSM>>
 <<set $nextButton = "Back", $nextLink = "Main", $showEncyclopedia = 1, $encyclopedia = "What the Upgrades Do">>
 
 <<if $cheatMode == 1>>
@@ -75,8 +75,8 @@ __Penthouse Facilities__
 <br>
 
 <<if $clinic == 0>>
-	[[Expand the surgical recovery area to accommodate patients and a nurse|Manage Penthouse][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $clinic = 5, $PC.engineering += 1]]
-	//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>//
+	[[Expand the surgical recovery area to accommodate patients and a nurse|Manage Penthouse][$cash -= Math.trunc(5000*$upgradeMultiplierArcology*$HackingSkillMultiplier), $clinic = 5, $PC.engineering += 1]]
+	//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>//
 <<else>>
 	The surgical recovery area has been expanded to take in more unhealthy slaves and be staffed by a nurse.
 <</if>>
@@ -95,8 +95,8 @@ __Penthouse Facilities__
 <<if $familyTesting == 1 && $seePreg != 0>>
 <<if $arcologyUpgrade.grid == 1>>
 <<if $incubator == 0>>
-	[[Install an incubation chamber to rapidly age children|Manage Penthouse][$cash -= Math.trunc(100000*$upgradeMultiplierArcology), $incubator = 1, $PC.engineering += 1]]
-	//Costs <<print cashFormat(Math.trunc(100000*$upgradeMultiplierArcology))>>//
+	[[Install an incubation chamber to rapidly age children|Manage Penthouse][$cash -= Math.trunc(100000*$upgradeMultiplierArcology*$HackingSkillMultiplier), $incubator = 1, $PC.engineering += 1]]
+	//Costs <<print cashFormat(Math.trunc(100000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>//
 <<else>>
 	The penthouse has a specialized facility dedicated to rapidly aging children.
 <</if>>
@@ -118,8 +118,8 @@ __Penthouse Facilities__
 	<<if $researchLab.built == "true">>
 		Your penthouse is now equipped with a research lab.
 	<<else>>
-		[[Clear out one of the floors and install research equipment|Manage Penthouse][$cash -= Math.trunc(15000*$upgradeMultiplierArcology), $researchLab.built = "true", $researchLab.maxSpace = 5, $PC.engineering += 1]]
-		//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology))>>//
+		[[Clear out one of the floors and install research equipment|Manage Penthouse][$cash -= Math.trunc(15000*$upgradeMultiplierArcology*$HackingSkillMultiplier), $researchLab.built = "true", $researchLab.maxSpace = 5, $PC.engineering += 1]]
+		//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>//
 	<</if>>
 <</if>>
 
@@ -206,8 +206,8 @@ __Penthouse Upgrades__
 <br>
 
 <<if $feeder == 0>>
-	[[Upgrade the kitchen's nutritional sensing systems|Manage Penthouse][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $feeder = 1, $PC.engineering += .1]]
-	//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>//
+	[[Upgrade the kitchen's nutritional sensing systems|Manage Penthouse][$cash -= Math.trunc(5000*$upgradeMultiplierArcology*$HackingSkillMultiplier), $feeder = 1, $PC.engineering += .1]]
+	//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>//
 <<else>>
 	The kitchen mounts sensors to refine diets in real time.
 <</if>>
@@ -246,8 +246,8 @@ __Penthouse Upgrades__
 <br>
 
 <<if $studio == 0>>
-	[[Install a media hub to convert slave video feeds into pornography|Manage Penthouse][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $studio = 1, $PC.engineering += 1]]
-	//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>//
+	[[Install a media hub to convert slave video feeds into pornography|Manage Penthouse][$cash -= Math.trunc(10000*$upgradeMultiplierArcology*$HackingSkillMultiplier), $studio = 1, $PC.engineering += 1]]
+	//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>//
 <<else>>
 	The arcology's video systems are connected to a media hub that can convert slave video feeds into pornography.
 <</if>>
@@ -268,8 +268,8 @@ __Penthouse Upgrades__
 
 <<if $surgeryUpgrade == 0>>
 <<if $rep > 10000>>
-	[[Upgrade the remote surgery|Manage Penthouse][$cash -= Math.trunc(50000*$upgradeMultiplierArcology), $surgeryUpgrade = 1, $PC.engineering += 1]]
-	//Costs <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>>//
+	[[Upgrade the remote surgery|Manage Penthouse][$cash -= Math.trunc(50000*$upgradeMultiplierArcology*$HackingSkillMultiplier), $surgeryUpgrade = 1, $PC.engineering += 1]]
+	//Costs <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>//
 <<else>>
 	//You lack the reputation to secure rare surgery upgrades//
 <</if>>
@@ -281,8 +281,8 @@ __Penthouse Upgrades__
 
 <<if $dispensary == 0>>
 <<if $rep > 2000>>
-	[[Install a pharmaceutical fabricator|Manage Penthouse][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $dispensary = 1, $drugsCost = $drugsCost*.75, $PC.engineering += .1]]
-	//Costs <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>>//
+	[[Install a pharmaceutical fabricator|Manage Penthouse][$cash -= Math.trunc(20000*$upgradeMultiplierArcology*$HackingSkillMultiplier), $dispensary = 1, $drugsCost = $drugsCost*.75, $PC.engineering += .1]]
+	//Costs <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>//
 <<else>>
 	//You lack the reputation to obtain cutting-edge pharmaceutical technology//
 <</if>>
@@ -299,16 +299,16 @@ __Penthouse Upgrades__
 	<<case 1>>
 	There is a facility to construct mechanical prosthetic limbs for amputated slaves.
 	<<if ($rep > 14000)>>
-		[[Research advanced prototype prosthetics|Manage Penthouse][$cash -= Math.trunc(100000*$upgradeMultiplierArcology), $prostheticsUpgrade = 2]]
-		//Costs <<print cashFormat(Math.trunc(100000*$upgradeMultiplierArcology))>>//
+		[[Research advanced prototype prosthetics|Manage Penthouse][$cash -= Math.trunc(100000*$upgradeMultiplierArcology*$HackingSkillMultiplier), $prostheticsUpgrade = 2]]
+		//Costs <<print cashFormat(Math.trunc(100000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>//
 	<<else>>
 		//You lack the reputation to research and produce prototype prosthetics.//
 	<</if>>
 	<<case 2>>
 	There is a prosthetics facility upgraded to use advanced materials and designs.
 	<<if ($rep > 16000)>>
-		[[Research high-tech cybernetic limbs|Manage Penthouse][$cash -= Math.trunc(100000*$upgradeMultiplierArcology), $prostheticsUpgrade = 3]]
-		//Costs <<print cashFormat(Math.trunc(100000*$upgradeMultiplierArcology))>>//
+		[[Research high-tech cybernetic limbs|Manage Penthouse][$cash -= Math.trunc(100000*$upgradeMultiplierArcology*$HackingSkillMultiplier), $prostheticsUpgrade = 3]]
+		//Costs <<print cashFormat(Math.trunc(100000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>//
 	<<else>>
 		//You lack the reputation to research and produce prototype cybernetic limbs.//
 	<</if>>
@@ -316,8 +316,8 @@ __Penthouse Upgrades__
 	There is a high-tech facility to build prosthetics and state-of-the-art cybernetic replacement limbs.
 	<<default>>
 	<<if ($rep > 12000)>>
-		[[Construct a mechanical prosthetics facility|Manage Penthouse][$cash -= Math.trunc(100000*$upgradeMultiplierArcology), $prostheticsUpgrade = 1, $PC.engineering += 1]]
-		//Costs <<print cashFormat(Math.trunc(100000*$upgradeMultiplierArcology))>>//
+		[[Construct a mechanical prosthetics facility|Manage Penthouse][$cash -= Math.trunc(100000*$upgradeMultiplierArcology*$HackingSkillMultiplier), $prostheticsUpgrade = 1, $PC.engineering += 1]]
+		//Costs <<print cashFormat(Math.trunc(100000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>//
 	<<else>>
 		//You lack the reputation to construct a prosthetics facility.//
 	<</if>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 3b910091e3f0d251883b73d625b5f5d82a0cdd01..7f45413558bd4497566a9604cd1e23b9110e31e2 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -460,7 +460,6 @@
 <</if>>
 
 /* Acquisition Events */
-
 <<set $events.push("RE recruit")>>
 <<if random(1,100) < $rep/200>>
 	<<set $events.push("RE recruit")>>
@@ -521,8 +520,8 @@
 			<<set $recruit.push("Lost mother")>>
 		<</if>>
 	<</if>>
-<</if>>
 	
+<</if>>
 	
 <<set $recruit.push("female SD")>>
 <<set $recruit.push("female SD 2")>>
@@ -571,7 +570,7 @@
 <<if $seeDicks != 0>> /*XY ACQUISITIONS*/
 
 <<if ($familyTesting == 1 && $PC.father == 0) && $securityForceActive == 1 || $mercenaries >= 1 || $activeUnits > 0 || $Bodyguard != 0 || $cash >= 20000>>
-		<set $recruit.push("Lost father")>>
+		<<set $recruit.push("Lost father")>>
 	<</if>>
 
 <<set $recruit.push("male debtor")>>
@@ -1303,7 +1302,6 @@
 		<<set $REFSevent.push("degradationist encounter")>>
 	<</if>>
 
-
 /* EVENT RANDOMIZATION */
 
 <<for $i = 0; $i < $RecETSevent.length; $i++>>
@@ -1329,4 +1327,3 @@
 
 <</silently>>
 <</if>> /* CLOSES SLAVE SELECT */
-