diff --git a/src/pregmod/theBlackMarket.tw b/src/pregmod/theBlackMarket.tw
index b655936e4fc594e7bfadfa2ba1ef31adef93953f..0142a0b9351d16640262a3b970e75af636b5de23 100644
--- a/src/pregmod/theBlackMarket.tw
+++ b/src/pregmod/theBlackMarket.tw
@@ -55,121 +55,117 @@ Of all the wonders present, the thing that catches your eye the most is a shady
<<if $thisWeeksFSWares.length > 0>>
<<for _bm = 0; _bm < $thisWeeksFSWares.length; _bm++>>
- <br>
- <<if $thisWeeksFSWares[_bm] == "GenderRadicalistResearch">>
- <<if $seePreg != 0 && $arcologies[0].FSGenderRadicalistResearch == 0>>
- <<if $organFarmUpgrade > 0>>
- <<if $cash >= 75000>>
- [[Purchase schematics for anal pregnancy|The Black Market][cashX(-75000, "capEx"), $arcologies[0].FSGenderRadicalistResearch = 1, _dump = $merchantFSWares.delete("GenderRadicalistResearch")]] //@@.yellowgreen;<<print cashFormat(75000)>>.@@//
+ <div>
+ <<switch $thisWeeksFSWares[_bm]>>
+ <<case "GenderRadicalistResearch">>
+ <<if $seePreg != 0 && $arcologies[0].FSGenderRadicalistResearch == 0>>
+ <<if $organFarmUpgrade > 0>>
+ <<if $cash >= 75000>>
+ [[Purchase schematics for anal pregnancy|The Black Market][cashX(-75000, "capEx"), $arcologies[0].FSGenderRadicalistResearch = 1, _dump = $merchantFSWares.delete("GenderRadicalistResearch")]] //@@.yellowgreen;<<print cashFormat(75000)>>.@@//
+ <<else>>
+ You cannot afford the asking price of @@.red;<<print cashFormat(75000)>>@@ for anal pregnancy schematics. "No discounts. No haggling. No price naming. Take it or leave it."
+ <</if>>
+ <<else>>
+ You lack the facilities needed to grow organs, so anal pregnancy schematics are currently out of your reach.
+ <</if>>
+ <<elseif $seePreg == 0>>
+ You have no interest in this pregnancy based research.
<<else>>
- You cannot afford the asking price of @@.red;<<print cashFormat(75000)>>@@ for anal pregnancy schematics. "No discounts. No haggling. No price naming. Take it or leave it."
+ You already possess designs to facilitate anal pregnancy.
+ <<run $merchantFSWares.delete("GenderRadicalistResearch")>>
<</if>>
- <<else>>
- You lack the facilities needed to grow organs, so anal pregnancy schematics are currently out of your reach.
- <</if>>
- <<elseif $seePreg == 0>>
- You have no interest in this pregnancy based research.
- <<else>>
- You already possess designs to facilitate anal pregnancy.
- <<run $merchantFSWares.delete("GenderRadicalistResearch")>>
- <</if>>
- <</if>>
- <<if $thisWeeksFSWares[_bm] == "SlaveProfessionalismResearch">>
- <<if $arcologies[0].FSSlaveProfessionalismResearch == 0>>
- <<if $dispensary == 1>>
- <<if $cash >= 90000>>
- [[Purchase the recipe for a proven intelligence boosting compound|The Black Market][cashX(-90000, "capEx"), $arcologies[0].FSSlaveProfessionalismResearch = 1, _dump = $merchantFSWares.delete("SlaveProfessionalismResearch")]] //@@.yellowgreen;<<print cashFormat(90000)>>.@@//
+ <<case "SlaveProfessionalismResearch">>
+ <<if $arcologies[0].FSSlaveProfessionalismResearch == 0>>
+ <<if $dispensary == 1>>
+ <<if $cash >= 90000>>
+ [[Purchase the recipe for a proven intelligence boosting compound|The Black Market][cashX(-90000, "capEx"), $arcologies[0].FSSlaveProfessionalismResearch = 1, _dump = $merchantFSWares.delete("SlaveProfessionalismResearch")]] //@@.yellowgreen;<<print cashFormat(90000)>>.@@//
+ <<else>>
+ You cannot afford the asking price of @@.red;<<print cashFormat(90000)>>@@ for a proven intelligence boosting compound. "A cup of tea brewed from this compound makes one smarter. Too bad I don't hand out free samples so people like you can remember where they left their money."
+ <</if>>
+ <<else>>
+ You lack the facilities needed to produce drugs of this complexity, so the recipe for a proven intelligence boosting compound is currently unobtainable.
+ <</if>>
<<else>>
- You cannot afford the asking price of @@.red;<<print cashFormat(90000)>>@@ for a proven intelligence boosting compound. "A cup of tea brewed from this compound makes one smarter. Too bad I don't hand out free samples so people like you can remember where they left their money."
+ You already possess a recipe for a mind improving tea.
+ <<run $merchantFSWares.delete("SlaveProfessionalismResearch")>>
<</if>>
- <<else>>
- You lack the facilities needed to produce drugs of this complexity, so the recipe for a proven intelligence boosting compound is currently unobtainable.
- <</if>>
- <<else>>
- You already possess a recipe for a mind improving tea.
- <<run $merchantFSWares.delete("SlaveProfessionalismResearch")>>
- <</if>>
- <</if>>
- <<if $thisWeeksFSWares[_bm] == "TransformationFetishistResearch">>
- <<if $arcologies[0].FSTransformationFetishistResearch == 0>>
- <<if $ImplantProductionUpgrade == 1>>
- <<if $cash >= 50000>>
- [[Purchase designs for immense implants|The Black Market][cashX(-50000, "capEx"), $arcologies[0].FSTransformationFetishistResearch = 1, _dump = $merchantFSWares.delete("TransformationFetishistResearch")]] //@@.yellowgreen;<<print cashFormat(50000)>>.@@//
+ <<case "TransformationFetishistResearch">>
+ <<if $arcologies[0].FSTransformationFetishistResearch == 0>>
+ <<if $ImplantProductionUpgrade == 1>>
+ <<if $cash >= 50000>>
+ [[Purchase designs for immense implants|The Black Market][cashX(-50000, "capEx"), $arcologies[0].FSTransformationFetishistResearch = 1, _dump = $merchantFSWares.delete("TransformationFetishistResearch")]] //@@.yellowgreen;<<print cashFormat(50000)>>.@@//
+ <<else>>
+ You cannot afford the asking price of @@.red;<<print cashFormat(50000)>>@@ for absurdly huge implant designs. "No big fake boobs for you. How sad it must be to be flat and enslaved by such a poor <<if $PC.title == 1>>Master<<else>>Mistress<</if>>"
+ <</if>>
+ <<else>>
+ You lack the facilities needed to produce implants of this caliber, so absurdly huge implant designs are currently unobtainable.
+ <</if>>
<<else>>
- You cannot afford the asking price of @@.red;<<print cashFormat(50000)>>@@ for absurdly huge implant designs. "No big fake boobs for you. How sad it must be to be flat and enslaved by such a poor <<if $PC.title == 1>>Master<<else>>Mistress<</if>>"
+ You already possess designs for oversized implants.
+ <<run $merchantFSWares.delete("TransformationFetishistResearch")>>
<</if>>
- <<else>>
- You lack the facilities needed to produce implants of this caliber, so absurdly huge implant designs are currently unobtainable.
- <</if>>
- <<else>>
- You already possess designs for oversized implants.
- <<run $merchantFSWares.delete("TransformationFetishistResearch")>>
- <</if>>
- <</if>>
- <<if $thisWeeksFSWares[_bm] == "AssetExpansionistResearch">>
- <<if $arcologies[0].FSAssetExpansionistResearch == 0>>
- <<if $dispensary == 1>>
- <<if $cash >= 50000>>
- [[Purchase formulas for extremely powerful growth drugs|The Black Market][cashX(-50000, "capEx"), $arcologies[0].FSAssetExpansionistResearch = 1, _dump = $merchantFSWares.delete("AssetExpansionistResearch")]] //@@.yellowgreen;<<print cashFormat(50000)>>.@@//
+ <<case "AssetExpansionistResearch">>
+ <<if $arcologies[0].FSAssetExpansionistResearch == 0>>
+ <<if $dispensary == 1>>
+ <<if $cash >= 50000>>
+ [[Purchase formulas for extremely powerful growth drugs|The Black Market][cashX(-50000, "capEx"), $arcologies[0].FSAssetExpansionistResearch = 1, _dump = $merchantFSWares.delete("AssetExpansionistResearch")]] //@@.yellowgreen;<<print cashFormat(50000)>>.@@//
+ <<else>>
+ You cannot afford the asking price of @@.red;<<print cashFormat(50000)>>@@ for extremely powerful growth drug formulas. "Why'd you even come here if you didn't have the credits to buy anything?"
+ <</if>>
+ <<else>>
+ You lack the facilities needed to produce drugs of this complexity, so absurdly powerful implant growth drug formulas are currently unobtainable.
+ <</if>>
<<else>>
- You cannot afford the asking price of @@.red;<<print cashFormat(50000)>>@@ for extremely powerful growth drug formulas. "Why'd you even come here if you didn't have the credits to buy anything?"
+ You already possess formulas for extremely powerful growth drugs.
+ <<run $merchantFSWares.delete("AssetExpansionistResearch")>>
<</if>>
- <<else>>
- You lack the facilities needed to produce drugs of this complexity, so absurdly powerful implant growth drug formulas are currently unobtainable.
- <</if>>
- <<else>>
- You already possess formulas for extremely powerful growth drugs.
- <<run $merchantFSWares.delete("AssetExpansionistResearch")>>
- <</if>>
- <</if>>
- <<if $thisWeeksFSWares[_bm] == "SlimnessEnthusiastResearch">>
- <<if $arcologies[0].FSSlimnessEnthusiastResearch == 0>>
- <<if $dispensary == 1>>
- <<if $cash >= 75000>>
- [[Purchase formulas for growth reversing drugs|The Black Market][cashX(-75000, "capEx"), $arcologies[0].FSSlimnessEnthusiastResearch = 1, _dump = $merchantFSWares.delete("SlimnessEnthusiastResearch")]] //@@.yellowgreen;<<print cashFormat(75000)>>.@@//
+ <<case "SlimnessEnthusiastResearch">>
+ <<if $arcologies[0].FSSlimnessEnthusiastResearch == 0>>
+ <<if $dispensary == 1>>
+ <<if $cash >= 75000>>
+ [[Purchase formulas for growth reversing drugs|The Black Market][cashX(-75000, "capEx"), $arcologies[0].FSSlimnessEnthusiastResearch = 1, _dump = $merchantFSWares.delete("SlimnessEnthusiastResearch")]] //@@.yellowgreen;<<print cashFormat(75000)>>.@@//
+ <<else>>
+ You cannot afford the asking price of @@.red;<<print cashFormat(75000)>>@@ for growth reversing drug formulas. "<<if $PC.boobs >= 1000>>Guess you'll be keeping those knockers for now, <<if $PC.title == 0>>Little-Miss-Top-Heavy<<else>>Mr. Busty<</if>><<else>>Guess you don't mind sore backs. Leads to less sore knees, from what I've heard<</if>>."
+ <</if>>
+ <<else>>
+ You lack the facilities needed to produce drugs of this complexity, so growth reversing drug formulas are currently unobtainable.
+ <</if>>
<<else>>
- You cannot afford the asking price of @@.red;<<print cashFormat(75000)>>@@ for growth reversing drug formulas. "<<if $PC.boobs >= 1000>>Guess you'll be keeping those knockers for now, <<if $PC.title == 0>>Little-Miss-Top-Heavy<<else>>Mr. Busty<</if>><<else>>Guess you don't mind sore backs. Leads to less sore knees, from what I've heard<</if>>."
+ You already possess formulas for growth reversing drugs.
+ <<run $merchantFSWares.delete("SlimnessEnthusiastResearch")>>
<</if>>
- <<else>>
- You lack the facilities needed to produce drugs of this complexity, so growth reversing drug formulas are currently unobtainable.
- <</if>>
- <<else>>
- You already possess formulas for growth reversing drugs.
- <<run $merchantFSWares.delete("SlimnessEnthusiastResearch")>>
- <</if>>
- <</if>>
- <<if $thisWeeksFSWares[_bm] == "YouthPreferentialistResearch">>
- <<if $arcologies[0].FSYouthPreferentialistResearch == 0>>
- <<if $dispensary == 1>>
- <<if $cash >= 45000>>
- [[Purchase formulas for extremely effective anti-aging beauty creams|The Black Market][cashX(-45000, "capEx"), $arcologies[0].FSYouthPreferentialistResearch = 1, _dump = $merchantFSWares.delete("YouthPreferentialistResearch")]] //@@.yellowgreen;<<print cashFormat(45000)>>.@@//
+ <<case "YouthPreferentialistResearch">>
+ <<if $arcologies[0].FSYouthPreferentialistResearch == 0>>
+ <<if $dispensary == 1>>
+ <<if $cash >= 45000>>
+ [[Purchase formulas for extremely effective anti-aging beauty creams|The Black Market][cashX(-45000, "capEx"), $arcologies[0].FSYouthPreferentialistResearch = 1, _dump = $merchantFSWares.delete("YouthPreferentialistResearch")]] //@@.yellowgreen;<<print cashFormat(45000)>>.@@//
+ <<else>>
+ You cannot afford the asking price of @@.red;<<print cashFormat(45000)>>@@ for extremely effective anti-aging beauty creams. "<<if $PC.visualAge > 40>>Those wrinkles don't look that bad on you, so don't worry about not being able to afford this<<else>>Just tell them they look young, and, well, don't give them any mirrors. Probably should keep your money troubles from them, too<</if>>."
+ <</if>>
+ <<else>>
+ You lack the facilities needed to produce drugs of this complexity, so extremely effective anti-aging beauty creams formulas are currently unobtainable.
+ <</if>>
<<else>>
- You cannot afford the asking price of @@.red;<<print cashFormat(45000)>>@@ for extremely effective anti-aging beauty creams. "<<if $PC.visualAge > 40>>Those wrinkles don't look that bad on you, so don't worry about not being able to afford this<<else>>Just tell them they look young, and, well, don't give them any mirrors. Probably should keep your money troubles from them, too<</if>>."
+ You already possess formulas for extremely effective anti-aging beauty cream.
+ <<run $merchantFSWares.delete("YouthPreferentialistResearch")>>
<</if>>
- <<else>>
- You lack the facilities needed to produce drugs of this complexity, so extremely effective anti-aging beauty creams formulas are currently unobtainable.
- <</if>>
- <<else>>
- You already possess formulas for extremely effective anti-aging beauty cream.
- <<run $merchantFSWares.delete("YouthPreferentialistResearch")>>
- <</if>>
- <</if>>
- <<if $thisWeeksFSWares[_bm] == "HedonisticDecadenceResearch">>
- <<if $arcologies[0].FSHedonisticDecadenceResearch == 0>>
- <<if $dispensary == 1>>
- <<if $cash >= 65000>>
- [[Purchase recipes for highly addictive solid slave food|The Black Market][cashX(-65000, "capEx"), $arcologies[0].FSHedonisticDecadenceResearch = 1, _dump = $merchantFSWares.delete("HedonisticDecadenceResearch")]] //@@.yellowgreen;<<print cashFormat(65000)>>.@@//
+ <<case "HedonisticDecadenceResearch">>
+ <<if $arcologies[0].FSHedonisticDecadenceResearch == 0>>
+ <<if $dispensary == 1>>
+ <<if $cash >= 65000>>
+ [[Purchase recipes for highly addictive solid slave food|The Black Market][cashX(-65000, "capEx"), $arcologies[0].FSHedonisticDecadenceResearch = 1, _dump = $merchantFSWares.delete("HedonisticDecadenceResearch")]] //@@.yellowgreen;<<print cashFormat(65000)>>.@@//
+ <<else>>
+ You cannot afford the asking price of @@.red;<<print cashFormat(65000)>>@@ for highly addictive solid slave food recipes. "I promise you'll not be able to recreate this at home, so if you want to give your begging slave the treat she deserves, buy now! Or, you know, come back with money."
+ <</if>>
+ <<else>>
+ You lack the facilities needed to produce drugs of this complexity, so highly addictive solid slave food recipes are currently unobtainable.
+ <</if>>
<<else>>
- You cannot afford the asking price of @@.red;<<print cashFormat(65000)>>@@ for highly addictive solid slave food recipes. "I promise you'll not be able to recreate this at home, so if you want to give your begging slave the treat she deserves, buy now! Or, you know, come back with money."
+ You already possess recipes for highly addictive solid slave food.
+ <<run $merchantFSWares.delete("HedonisticDecadenceResearch")>>
<</if>>
- <<else>>
- You lack the facilities needed to produce drugs of this complexity, so highly addictive solid slave food recipes are currently unobtainable.
- <</if>>
- <<else>>
- You already possess recipes for highly addictive solid slave food.
- <<run $merchantFSWares.delete("HedonisticDecadenceResearch")>>
- <</if>>
- <</if>>
+ <</switch>>
+ </div>
<</for>>
<<else>>
<br>You appear to already possess all the societal based schematics he has to offer.