diff --git a/src/Corporation/corporateMarket.tw b/src/Corporation/corporateMarket.tw
index def8ba4ea05d20a1121887dc37b82053d0e98327..47706c426413fa25b79aab001b2297ba05ed6634 100644
--- a/src/Corporation/corporateMarket.tw
+++ b/src/Corporation/corporateMarket.tw
@@ -1,10 +1,10 @@
 :: Corporate Market [nobr]
 
-<<set $nextButton = "Back", $nextLink = "Main">>
+<<set $nextButton = "Back", $nextLink = "Main", $slaveMarket = "corporate">>
 /* Multi-Purchase Support */
 <<if ndef $newSlaves>><<set $newSlaves = []>><</if>>
 <<if $newSlaves.length > 0>>
-	<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $slaveMarket = "corporate", $returnTo = "Main", $newSlaveIndex = 0>>
+	<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $returnTo = "Main", $newSlaveIndex = 0>>
 <</if>>
 
 <<if $corp.SpecGender == 2>>
diff --git a/src/pregmod/criminalMarkets.tw b/src/pregmod/criminalMarkets.tw
index a319abe3279873040c31da4cd256fe09057f1def..044f826e8a6e8f5ed291f23a78949f3e0f9391bd 100644
--- a/src/pregmod/criminalMarkets.tw
+++ b/src/pregmod/criminalMarkets.tw
@@ -1,10 +1,10 @@
 :: Criminal Market [nobr]
 
-<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Slave Schools">>
+<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Slave Schools", $slaveMarket = $weeklyMarket>>
 
 <<if ndef $newSlaves>><<set $newSlaves = []>><</if>>
 <<if $newSlaves.length > 0>>
-	<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $slaveMarket = $weeklyMarket, $returnTo = "Main", $newSlaveIndex = 0>>
+	<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $returnTo = "Main", $newSlaveIndex = 0>>
 <</if>>
 
 You board the transport to
diff --git a/src/pregmod/nuevaUniversidadDeLibertad.tw b/src/pregmod/nuevaUniversidadDeLibertad.tw
index a3c476b56aafde79344bdebcad9ddfa30090eea7..4e57aba5825ae2c1b6034bde2cc9e418722d445c 100644
--- a/src/pregmod/nuevaUniversidadDeLibertad.tw
+++ b/src/pregmod/nuevaUniversidadDeLibertad.tw
@@ -1,10 +1,10 @@
 :: Nueva Universidad de Libertad [nobr]
 
-<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Slave Schools">>
+<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Slave Schools", $slaveMarket = "NUL">>
 /* Multi-Purchase Support */
 <<if ndef $newSlaves>><<set $newSlaves = []>><</if>>
 <<if $newSlaves.length > 0>>
-	<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $slaveMarket = "NUL", $returnTo = "Main", $newSlaveIndex = 0>>
+	<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $returnTo = "Main", $newSlaveIndex = 0>>
 <</if>>
 
 //Nueva Universidad de Libertad is a unique slave school operating in the Free Cities. Its business model is to offer as close to asexuality as a sex slave can possess. All students have their sex organs surgically removed at a very young age, before the onset of puberty. This is followed by numerous cosmetic surgery alternations, alongside a steady regimen of hormone blockers, throughout their education. The result is an utterly physically androgynous slave. <<if $NUL.schoolUpgrade != 0>><br><br>You have endowed the school with advanced training courses in <<if $NUL.schoolUpgrade == 1>>entertainment and conversation<<else>>the various sexual arts<</if>>. As a major financial supporter of the institution, you also receive a discount on them.<</if>>//
diff --git a/src/pregmod/theCattleRanch.tw b/src/pregmod/theCattleRanch.tw
index a217cb1026652a6a28d736dccf2987f9be10dc6f..3171f0ffd48014dcb076a6e7e5ed671df2848465 100644
--- a/src/pregmod/theCattleRanch.tw
+++ b/src/pregmod/theCattleRanch.tw
@@ -1,10 +1,10 @@
 :: The Cattle Ranch [nobr]
 
-<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Slave Schools">>
+<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Slave Schools", $slaveMarket = "TCR">>
 /* Multi-Purchase Support */
 <<if ndef $newSlaves>><<set $newSlaves = []>><</if>>
 <<if $newSlaves.length > 0>>
-	<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $slaveMarket = "TCR", $returnTo = "Main", $newSlaveIndex = 0>>
+	<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $returnTo = "Main", $newSlaveIndex = 0>>
 <</if>>
 
 //The Cattle Ranch is a controversial slave school operating primarily out of Pastoralistic Free Cities. Its business model is to offer the ideal free range dairy cow; one whose tits and belly reach the floor when on all fours. All cattle come optimized for milking, with big breasts and gravid middles. Slave orphans have their heels clipped shortly after birth and are conditioned to believe they are actual livestock, resulting in a mindbreak-like state. Between their wide hips and big butts and their heavy, milky breasts, they are often popular breeding slaves. They rarely display their stock over video call, instead favoring a more hands-on approach. Buyers can visit their local shops to view grazing cattle available for sale. Alternatively, they can watch the calves frolic among their mothers or enjoy the sight of a breeding bull impregnating an empty womb. Cows are also specially trained to respond to spectators banging on the fence; oral awaits if you drop trou for them! <<if $TCR.schoolUpgrade != 0>><br><br>You have endowed <<if $TCR.schoolUpgrade == 1>>a healthy sum of credits to make their breeding bulls available for sale.<<else>>a healthy sum of credits to encourage the sale of heifers.<</if>> As a major benefact<<if $PC.title == 0>>rix<<else>>or<</if>> of the ranch, you also receive a discount on them.<</if>>//
diff --git a/src/pregmod/theHippolytaAcademy.tw b/src/pregmod/theHippolytaAcademy.tw
index c141d463568455b3a47fe6ba250e462634749cb8..28e813dfc99ee9504c3f5d0ba6c4a6382f60b6ac 100644
--- a/src/pregmod/theHippolytaAcademy.tw
+++ b/src/pregmod/theHippolytaAcademy.tw
@@ -1,10 +1,10 @@
 :: The Hippolyta Academy [nobr]
 
-<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Slave Schools">>
+<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Slave Schools", $slaveMarket = "HA">>
 /* Multi-Purchase Support */
 <<if ndef $newSlaves>><<set $newSlaves = []>><</if>>
 <<if $newSlaves.length > 0>>
-	<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $slaveMarket = "HA", $returnTo = "Main", $newSlaveIndex = 0>>
+	<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $returnTo = "Main", $newSlaveIndex = 0>>
 <</if>>
 
 //
diff --git a/src/pregmod/wetwareCPUs.tw b/src/pregmod/wetwareCPUs.tw
index 01307db09bbac0a53fcb39b441552be38552d0f4..fc8d7f0dbc900751419f46fd1c8b8417e6bfa06b 100644
--- a/src/pregmod/wetwareCPUs.tw
+++ b/src/pregmod/wetwareCPUs.tw
@@ -1,10 +1,10 @@
 :: Wetware CPUs [nobr]
 
-<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Slave Schools">>
+<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Slave Schools", $slaveMarket = "wetware">>
 /* Multi-Purchase Support */
 <<if ndef $newSlaves>><<set $newSlaves = []>><</if>>
 <<if $newSlaves.length > 0>>
-	<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $slaveMarket = "wetware", $returnTo = "Main", $newSlaveIndex = 0>>
+	<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $returnTo = "Main", $newSlaveIndex = 0>>
 <</if>>
 
 //Wetware CPUs offer highly trained slaves with useful career experience at a discount; That is, at the cost of the physical health of the merchandise.//
diff --git a/src/uncategorized/growthResearchInstitute.tw b/src/uncategorized/growthResearchInstitute.tw
index 31c25fa7001c27bffa46fea5aaab4a6cea15694a..94f05d198578d73a1949eea64121d91f6d744f00 100644
--- a/src/uncategorized/growthResearchInstitute.tw
+++ b/src/uncategorized/growthResearchInstitute.tw
@@ -1,10 +1,10 @@
 :: Growth Research Institute [nobr]
 
-<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Slave Schools">>
+<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Slave Schools", $slaveMarket = "GRI">>
 /* Multi-Purchase Support */
 <<if ndef $newSlaves>><<set $newSlaves = []>><</if>>
 <<if $newSlaves.length > 0>>
-	<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $slaveMarket = "GRI", $returnTo = "Main", $newSlaveIndex = 0>>
+	<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $returnTo = "Main", $newSlaveIndex = 0>>
 <</if>>
 
 //The Growth Research Institute (GRI) is not primarily a slave school at all, but rather the world leader in female growth hormone development. It operates research centers in the Free Cities to avoid traditional medical research laws. GRI runs several slave schools to raise healthy, unmodified subjects for use in trials. After a year of experimental hormone treatment they are sold. <<if $GRI.schoolUpgrade != 0>><br><br>You have endowed <<if $GRI.schoolUpgrade == 1>>a research focus on advanced curatives; most subjects now leave the GRI at unnatural levels of vitality.<<else>>a research focus on milk production; subjects' breasts are bigger and milkier than ever.<</if>> As a major benefact<<if $PC.title == 0>>rix<<else>>or<</if>> of the institution, you also receive a discount on them.<</if>>//
diff --git a/src/uncategorized/lecoleDesEnculees.tw b/src/uncategorized/lecoleDesEnculees.tw
index 66a9733cd7c43023fe71a14447e2a3bec4cccd12..81125c83625265ea7a794e45f467baca3f2d88e2 100644
--- a/src/uncategorized/lecoleDesEnculees.tw
+++ b/src/uncategorized/lecoleDesEnculees.tw
@@ -1,10 +1,10 @@
 :: L'École des Enculées [nobr]
 
-<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Slave Schools">>
+<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Slave Schools", $slaveMarket = "LDE">>
 /* Multi-Purchase Support */
 <<if ndef $newSlaves>><<set $newSlaves = []>><</if>>
 <<if $newSlaves.length > 0>>
-	<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $slaveMarket = "LDE", $returnTo = "Main", $newSlaveIndex = 0>>
+	<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $returnTo = "Main", $newSlaveIndex = 0>>
 <</if>>
 
 //L'École des Enculées is one of the oldest networks of slave schools, but because its training must be started early, it is only now beginning to produce and show a return on its investors' stakes. It aims to produce graduates more feminine than the average naturally born female, in spite of their having been born male. The school is a global leader in hormonal feminization, which allows it to produce curvier slaves than many schools that focus on natural females. It also retains its graduates for a year after their majority and their enslavement, so as to be able to legally subject them to intensive sexual conditioning that focuses on their prostates as their main remaining locus of arousal. <<if $LDE.schoolUpgrade != 0>><br><br>Since you have endowed <<if $LDE.schoolUpgrade == 1>>the regular application of drugs to induce extreme infatuation in its graduates towards the first dominant person they encounter, any graduate purchased here will now promptly fall in love with you.<<else>>research into narrowly targeted hormonal treatments, its graduates are now available with generous members despite their femininity.<</if>> As a major benefact<<if $PC.title == 0>>rix<<else>>or<</if>> of the institution, you also receive a discount on them.<</if>>//
diff --git a/src/uncategorized/stClaverPreparatory.tw b/src/uncategorized/stClaverPreparatory.tw
index 5a1b3102d96fb635d6eedc1707c3e8df73203c7c..d573b2a1cff278be7db7221055aac6e26349b2ae 100644
--- a/src/uncategorized/stClaverPreparatory.tw
+++ b/src/uncategorized/stClaverPreparatory.tw
@@ -1,10 +1,10 @@
 :: St. Claver Preparatory [nobr]
 
-<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Slave Schools">>
+<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Slave Schools", $slaveMarket = "SCP">>
 /* Multi-Purchase Support */
 <<if ndef $newSlaves>><<set $newSlaves = []>><</if>>
 <<if $newSlaves.length > 0>>
-	<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $slaveMarket = "SCP", $returnTo = "Main", $newSlaveIndex = 0>>
+	<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $returnTo = "Main", $newSlaveIndex = 0>>
 <</if>>
 
 //St. Claver Preparatory is an old world preparatory school that was purchased by an old world medical school adapting to the demand for plastic surgeons from the Free Cities. It functions as a standard slave school until its students near graduation. At that point they are paired with a budding plastic surgeon. Intensive, flawless, and of course successful surgical modification of the student is required to complete certification as a Free Cities plastic surgeon of the top rank. All St. Claver's graduates are modified to a single exacting standard. Meanwhile, the slave school is free to train its students for obedience and sexual conformity. <<if $SCP.schoolUpgrade != 0>><br><br>You have endowed <<if $SCP.schoolUpgrade == 1>>thorough use of mental suppressants that reliably produce total devotion at the price of total stupidity.<<else>>diversification of the school's approach into general slave training that produces graduates with basic skills.<</if>> As a major <<if $PC.title == 0>>benefactrix<<else>>benefactor<</if>> of the institution, you also receive a discount on them.<</if>>//
diff --git a/src/uncategorized/theFutanariSisters.tw b/src/uncategorized/theFutanariSisters.tw
index 78100e15ae859101b99cb122d613e6b885c15314..6d2db7c81a8cf294f1d17d697c0de64ecf194583 100644
--- a/src/uncategorized/theFutanariSisters.tw
+++ b/src/uncategorized/theFutanariSisters.tw
@@ -1,10 +1,10 @@
 :: The Futanari Sisters [nobr]
 
-<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Slave Schools">>
+<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Slave Schools", $slaveMarket = "TFS">>
 /* Multi-Purchase Support */
 <<if ndef $newSlaves>><<set $newSlaves = []>><</if>>
 <<if $newSlaves.length > 0>>
-	<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $slaveMarket = "TFS", $returnTo = "Main", $newSlaveIndex = 0>>
+	<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $returnTo = "Main", $newSlaveIndex = 0>>
 <</if>>
 
 <<if $TFS.schoolPresent == 1>>
diff --git a/src/uncategorized/theGymnasiumAcademy.tw b/src/uncategorized/theGymnasiumAcademy.tw
index 5cd8f84550e1966d8a8f7289b3e832be49264eeb..8a5e85e48d99f667daaf4bf28006427bd858cce0 100644
--- a/src/uncategorized/theGymnasiumAcademy.tw
+++ b/src/uncategorized/theGymnasiumAcademy.tw
@@ -1,10 +1,10 @@
 :: The Gymnasium-Academy [nobr]
 
-<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Slave Schools">>
+<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Slave Schools", $slaveMarket = "TGA">>
 /* Multi-Purchase Support */
 <<if ndef $newSlaves>><<set $newSlaves = []>><</if>>
 <<if $newSlaves.length > 0>>
-	<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $slaveMarket = "TGA", $returnTo = "Main", $newSlaveIndex = 0>>
+	<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $returnTo = "Main", $newSlaveIndex = 0>>
 <</if>>
 
 //The Gymnasium-Academy is a very unusual slave school. It sits at a bizarre juncture of the evolving gender roles and slave roles in the Free Cities. Its graduates are exclusively born male, and are not surgically or hormonally changed, but are thoroughly indoctrinated in the gender roles of the Free Cities to be accepting of their place in the new and rapidly changing world. Since the Gymnasium-Academy produces graduates with a greater ability to build muscle, fitness and virility than any of its competitors, it also trains for athletic perfection to further differentiate them. This training relies on traditional methods of corporal punishment. <<if $TGA.schoolUpgrade != 0>><br><br>Since you have endowed <<if $TGA.schoolUpgrade == 1>>advanced training methods at the Gymnasium-Academy, its graduates are now fanatically loyal.<<else>>a combat training center at the Gymnasium-Academy, its graduates are now deadly fighters.<</if>> As a major <<if $PC.title == 0>>benefactrix<<else>>benefactor<</if>> of the institution, you also receive a discount on them.<</if>>//
diff --git a/src/uncategorized/theSlavegirlSchool.tw b/src/uncategorized/theSlavegirlSchool.tw
index fcd88b0d60026825e5985814eecfc48f49131f3f..7a9915d230de690c238d80d528935a3f42db3ba2 100644
--- a/src/uncategorized/theSlavegirlSchool.tw
+++ b/src/uncategorized/theSlavegirlSchool.tw
@@ -1,10 +1,10 @@
 :: The Slavegirl School [nobr]
 
-<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Slave Schools">>
+<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Slave Schools", $slaveMarket = "TSS">>
 /* Multi-Purchase Support */
 <<if ndef $newSlaves>><<set $newSlaves = []>><</if>>
 <<if $newSlaves.length > 0>>
-	<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $slaveMarket = "TSS", $returnTo = "Main", $newSlaveIndex = 0>>
+	<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $returnTo = "Main", $newSlaveIndex = 0>>
 <</if>>
 
 //The Slavegirl School is the newest slave school operating in the Free Cities. Its business model is to offer simpler, cheaper wares than its competitors. All Slavegirl School graduates are natural-born females without surgical modifications. Their training emphasizes elimination of any serious psychological deformities. They are promptly enslaved and sold as soon as they reach their majorities, and are marketed as complete virgins. <<if $TSS.schoolUpgrade != 0>><br><br>You have endowed <<if $TSS.schoolUpgrade == 1>>an alternative college at The Slavegirl School, which focuses on retraining good MILF stock into mature slave girls.<<else>>an improvement in the simplistic school's approach that teaches good basic skills without losing too much efficiency.<</if>> As a major <<if $PC.title == 0>>benefactrix<<else>>benefactor<</if>> of the institution, you also receive a discount on them.<</if>>//