diff --git a/src/endWeek/persBusiness.js b/src/endWeek/persBusiness.js
index 6c9a0285cb3e192319aaff005ddaef93efd6b077..0ff17cbe473f5b75b0b714afe43e9551b65b2d7e 100644
--- a/src/endWeek/persBusiness.js
+++ b/src/endWeek/persBusiness.js
@@ -2,12 +2,19 @@ App.EndWeek.personalBusiness = function() {
 	const el = new DocumentFragment();
 	let r = [];
 	let he, his, him;
+	let _income;
+	let _Cal;
+	let _X;
+	let _windfall;
+	let _Catchtchance;
+	let _upgradeCount;
+	let _dataGain
 	if (V.useTabs === 0) {
 		App.UI.DOM.appendNewElement("h2", el, `Personal Business`)
 	}
 
 	if (V.cash < 0) {
-		let _cashX = cashX(forceNeg(1+Math.trunc(Math.abs(V.cash)/100)), "personalBusiness");
+		let _cashX = cashX(forceNeg(1 + Math.trunc(Math.abs(V.cash) / 100)), "personalBusiness");
 		r.push(`<span class="red">You are in debt.</span> This week, interest came to ${cashFormat(_cashX)}.`);
 		if (V.arcologies[0].FSRomanRevivalist !== "unset") {
 			r.push(`Society <span class="red">very strongly disapproves</span> of your being in debt; this damages the idea that you model yourself on what a Roman leader should be.`);
@@ -43,45 +50,45 @@ App.EndWeek.personalBusiness = function() {
 			r.push(`You have finally recovered from your injuries.`);
 		}
 	} else if ((V.personalAttention === "whoring")) {
-		let _income = random(2000,4500);
+		let _income = random(2000, 4500);
 		if (V.PC.belly >= 1500) {
 			if (V.arcologies[0].FSRepopulationFocus !== "unset") {
-				r.push(`You focus on finding "dates" this week and earn <span class="yellowgreen">${cashFormat(Math.trunc((_income*(V.rep/500))+(V.PC.belly)))}</span> for your body, much more than usual; you guess your pregnancy-focused population wants your baby-rounded body more than ever. However, doing such things <span class="red">damages your reputation.</span>`);
-				cashX(Math.trunc((_income*(V.rep/500))+(V.PC.belly)), "personalBusiness");
-				repX((V.rep*.95) - V.rep, "personalBusiness");
+				r.push(`You focus on finding "dates" this week and earn <span class="yellowgreen">${cashFormat(Math.trunc((_income * (V.rep / 500)) + (V.PC.belly)))}</span> for your body, much more than usual; you guess your pregnancy-focused population wants your baby-rounded body more than ever. However, doing such things <span class="red">damages your reputation.</span>`);
+				cashX(Math.trunc((_income * (V.rep / 500)) + (V.PC.belly)), "personalBusiness");
+				repX((V.rep * .95) - V.rep, "personalBusiness");
 			} else if (V.arcologies[0].FSRepopulationFocusPregPolicy === 1) {
-				r.push(`You focus on finding "dates" this week and earn <span class="yellowgreen">${cashFormat(Math.trunc((_income*(V.rep/500))+(V.PC.belly/2)))}</span> for your body, more than usual; but that's to be expected, after all, pregnancy is trendy right now. Event still, doing such things <span class="red">damages your reputation.</span>`);
-				cashX(Math.trunc((_income*(V.rep/500))+(V.PC.belly/2)), "personalBusiness");
-				repX((V.rep*.95) - V.rep, "personalBusiness");
+				r.push(`You focus on finding "dates" this week and earn <span class="yellowgreen">${cashFormat(Math.trunc((_income * (V.rep / 500)) + (V.PC.belly / 2)))}</span> for your body, more than usual; but that's to be expected, after all, pregnancy is trendy right now. Event still, doing such things <span class="red">damages your reputation.</span>`);
+				cashX(Math.trunc((_income * (V.rep / 500)) + (V.PC.belly / 2)), "personalBusiness");
+				repX((V.rep * .95) - V.rep, "personalBusiness");
 			} else if (V.arcologies[0].FSRestart !== "unset") {
 				if (V.PC.pregSource !== -1 && V.PC.pregSource !== -6) {
 					r.push(`You focus on finding "dates" this week and earn <span class="yellowgreen">${cashFormat(25)},</span> barely enough to cover the abortion the john that gave it to you told you to get. Showing off your gravid body <span class="red">infuriates your citizens and cripples your reputation.</span>`);
 					cashX(25, "personalBusiness");
-					repX((V.rep*.5) - V.rep, "personalBusiness");
+					repX((V.rep * .5) - V.rep, "personalBusiness");
 					if (V.eugenicsFullControl !== 1) {
 						V.failedElite += 25;
 					}
 				} else {
-					r.push(`You focus on finding "dates" this week and earn <span class="yellowgreen">${cashFormat(Math.trunc(_income*(V.rep/500)))}</span> for your body. However, doing such things <span class="red">damages your reputation.</span>`);
-					cashX(Math.trunc(_income*(V.rep/500)), "personalBusiness");
-					repX((V.rep*.9) - V.rep, "personalBusiness");
+					r.push(`You focus on finding "dates" this week and earn <span class="yellowgreen">${cashFormat(Math.trunc(_income * (V.rep / 500)))}</span> for your body. However, doing such things <span class="red">damages your reputation.</span>`);
+					cashX(Math.trunc(_income * (V.rep / 500)), "personalBusiness");
+					repX((V.rep * .9) - V.rep, "personalBusiness");
 				}
 			} else {
-				_income = random(5,2500);
-				r.push(`You focus on finding "dates" this week and earn <span class="yellowgreen">${cashFormat(Math.trunc(_income*(V.rep/800)))}</span> for your body, much less than usual; your pregnancy must be turning off potential clients. However, doing such things <span class="red">damages your reputation.</span>`);
-				cashX(Math.trunc(_income*(V.rep/800)), "personalBusiness");
-				repX((V.rep*.9) - V.rep, "personalBusiness");
+				_income = random(5, 2500);
+				r.push(`You focus on finding "dates" this week and earn <span class="yellowgreen">${cashFormat(Math.trunc(_income * (V.rep / 800)))}</span> for your body, much less than usual; your pregnancy must be turning off potential clients. However, doing such things <span class="red">damages your reputation.</span>`);
+				cashX(Math.trunc(_income * (V.rep / 800)), "personalBusiness");
+				repX((V.rep * .9) - V.rep, "personalBusiness");
 			}
 		} else {
-			r.push(`You focus on finding "dates" this week and earn <span class="yellowgreen">${cashFormat(Math.trunc(_income*(V.rep/500)))}</span> for your body. However, doing such things <span class="red">damages your reputation.</span>`);
-			cashX(Math.trunc(_income*(V.rep/500)), "personalBusiness");
-			repX((V.rep*.9) - V.rep, "personalBusiness");
+			r.push(`You focus on finding "dates" this week and earn <span class="yellowgreen">${cashFormat(Math.trunc(_income * (V.rep / 500)))}</span> for your body. However, doing such things <span class="red">damages your reputation.</span>`);
+			cashX(Math.trunc(_income * (V.rep / 500)), "personalBusiness");
+			repX((V.rep * .9) - V.rep, "personalBusiness");
 			if (canGetPregnant(V.PC)) {
-				if (V.arcologies[0].FSRepopulationFocus !== "unset" && random(1,100) > 80) {
+				if (V.arcologies[0].FSRepopulationFocus !== "unset" && random(1, 100) > 80) {
 					r.push(`A horny client offered you an extra <span class="yellowgreen">${cashFormat(1000)}</span> for downing some fertility drugs. You're already forgoing birth control, so what harm could an extra baby do?`);
 					cashX(1000, "personalBusiness");
 					V.PC.forcedFertDrugs += 2;
-				} else if (random(1,100) > 90) {
+				} else if (random(1, 100) > 90) {
 					if (V.PC.skill.medicine >= 25) {
 						r.push(`Your client this week tried to trick you into taking fertility supplements disguised as party drugs. You still took them, of course, but made sure he <span class="yellowgreen">paid extra</span> for the privilege.`);
 						cashX(1000, "personalBusiness");
@@ -97,21 +104,21 @@ App.EndWeek.personalBusiness = function() {
 	} else if ((V.personalAttention === "upkeep")) {
 		if (V.PC.belly >= 5000) {
 			r.push(`You spend your free time hustling around your penthouse, cleaning and making sure everything is in order. You manage to reduce your upkeep by 20%. Your `);
-	if (V.PC.preg > 0) {
-		r.push(`pregnancy`);
-	} else {
-		r.push(`big belly`);
-	}
-		r.push(` slows you down some`);
-	if (V.PC.counter.birthMaster > 0) {
-		r.push(`, but you're used to working around it`);
-	}
-		r.push(`.`);
+			if (V.PC.preg > 0) {
+				r.push(`pregnancy`);
+			} else {
+				r.push(`big belly`);
+			}
+			r.push(` slows you down some`);
+			if (V.PC.counter.birthMaster > 0) {
+				r.push(`, but you're used to working around it`);
+			}
+			r.push(`.`);
 		} else {
 			r.push(`You spend your free time hustling around your penthouse, cleaning and making sure everything is in order. You manage to reduce your upkeep by 25%.`);
-	if (V.PC.counter.birthMaster > 0) {
-		r.push(` This is much easier to do without a big baby bump in the way.`);
-	}
+			if (V.PC.counter.birthMaster > 0) {
+				r.push(` This is much easier to do without a big baby bump in the way.`);
+			}
 		}
 	} else if ((V.personalAttention === "defensive survey")) {
 		r.push(`This week you focus on surveying your defenses in person, <span class="green">making yourself more known throughout ${V.arcologies[0].name}.</span>`);
@@ -120,9 +127,9 @@ App.EndWeek.personalBusiness = function() {
 			r.push(`${IncreasePCSkills('warfare', 0.5)}`);
 		}
 	} else if ((V.personalAttention === "development project")) {
-		if ((V.arcologies[0].prosperity + 1 * (1 + Math.ceil(V.PC.skill.engineering/100))) < V.AProsperityCap) {
+		if ((V.arcologies[0].prosperity + 1 * (1 + Math.ceil(V.PC.skill.engineering / 100))) < V.AProsperityCap) {
 			r.push(`This week you focus on contributing to a local development project, <span class="green">boosting prosperity.</span>`);
-			V.arcologies[0].prosperity += 1 * (1 + Math.ceil(V.PC.skill.engineering/100));
+			V.arcologies[0].prosperity += 1 * (1 + Math.ceil(V.PC.skill.engineering / 100));
 			if (V.PC.skill.engineering < 100) {
 				r.push(`${IncreasePCSkills('engineering', 0.5)}`);
 			}
@@ -230,233 +237,232 @@ App.EndWeek.personalBusiness = function() {
 		let _caught = 0;
 		let _income;
 		if (V.rep >= 18000) { /* prestigious */
-			_income = random(8500,9000);
+			_income = random(8500, 9000);
 		} else if (V.rep >= 9000) { /* well known */
-			_income = random(4500,5000);
+			_income = random(4500, 5000);
 		} else {
-			_income = random(1500,2000);
+			_income = random(1500, 2000);
 		}
 		switch (_qualifiedFS.random()) {
-		case "eugenics":
-			_income += random(2500,4000);
-			if (V.eugenicsFullControl !== 1) {
-				r.push(`You are smuggling `);
-				if (V.PC.dick !== 0) {
-					r.push(`your`);
+			case "eugenics":
+				_income += random(2500, 4000);
+				if (V.eugenicsFullControl !== 1) {
+					r.push(`You are smuggling `);
+					if (V.PC.dick !== 0) {
+						r.push(`your`);
+					} else {
+						r.push(`one of the Societal Elite's`);
+					}
+					r.push(` semen to allow some desperate girls to be pregnant. Anonymity is really hard to attain, and it is easy to find out what you've been doing. Even if you did manage to make <span class="yellowgreen">${cashFormat(_income)},</span> the Societal Elite are <span class="red">quite displeased</span> by your actions.`);
+					V.failedElite += 50, _caught = 1;
 				} else {
-					r.push(`one of the Societal Elite's`);
+					r.push(`You are smuggling `);
+					if (V.PC.dick !== 0) {
+						r.push(`your`);
+					} else {
+						r.push(`one of the Societal Elite's`);
+					}
+					r.push(` semen to allow some desperate girls to be pregnant. Anonymity is really hard to attain, and it is easy to find out what you've been doing. Even if you did manage to make <span class="yellowgreen">${cashFormat(_income)},</span> the Societal Elite are <span class="red">quite displeased</span> by your actions, even though they know how little they can do about it now.`);
+					_caught = 1;
 				}
-		r.push(` semen to allow some desperate girls to be pregnant. Anonymity is really hard to attain, and it is easy to find out what you've been doing. Even if you did manage to make <span class="yellowgreen">${cashFormat(_income)},</span> the Societal Elite are <span class="red">quite displeased</span> by your actions.`);
-				V.failedElite += 50, _caught = 1;
-			} else {
-				r.push(`You are smuggling `);
-	if (V.PC.dick !== 0) {
-		r.push(`your`);
-	} else {
-		r.push(`one of the Societal Elite's`);
-	}
-		r.push(` semen to allow some desperate girls to be pregnant. Anonymity is really hard to attain, and it is easy to find out what you've been doing. Even if you did manage to make <span class="yellowgreen">${cashFormat(_income)},</span> the Societal Elite are <span class="red">quite displeased</span> by your actions, even though they know how little they can do about it now.`);
+			case "paternalist":
+				_income += random(1000, 1500);
+				r.push(`You manage to find a few low-standards slavers without any problem, but when you actually try to do business, you are quickly recognized. You only manage to make <span class="yellowgreen">${cashFormat(_income)}</span> before you are sent away. The people of your arcology are <span class="red">outraged by your lack of respect</span> for slave rights.`);
 				_caught = 1;
-			}
-		case "paternalist":
-			_income += random(1000,1500);
-			r.push(`You manage to find a few low-standards slavers without any problem, but when you actually try to do business, you are quickly recognized. You only manage to make <span class="yellowgreen">${cashFormat(_income)}</span> before you are sent away. The people of your arcology are <span class="red">outraged by your lack of respect</span> for slave rights.`);
-			_caught = 1;
-		case "supremacist":
-			_income += random(2000,3000);
-			r.push(`When it comes to smuggling in your arcology, there is no better target than ${V.arcologies[0].FSSupremacistRace} slaves, and there is a high demand for them, making you a nice <span class="yellowgreen">${cashFormat(_income)}.</span> Participating in this slave trade means you can control who is set. Your people do not see things in the same light though, and <span class="red">your reputation takes a big hit.</span>`);
-			_caught = 1;
-		case "degradationist":
-			_income += random(2000,3000);
-			r.push(`During your free time, you make business with a few low-standards slavers and manage to buy stolen slaves and sell them at a profit. Even if people recognized you, such treatment of slaves is normal, and only a few people would really complain about it. Your dealings have made you <span class="yellowgreen">${cashFormat(_income)}.</span>`);
-		case "repopulation":
-			_income += random(1500,2500);
-			r.push(`You manage to discreetly rent out your remote surgery services for abortions. You make sure the people do not recognize your penthouse, having them come blindfolded or unconscious, should the abortion request does not come from themselves. With this, you make <span class="yellowgreen">${cashFormat(_income)}.</span>`);
-		case "fundamentalist":
-			_income += random(1500,2500);
-			r.push(`You manage to arrange a few sex-changes and geldings in your own remote surgery for some powerful people to accommodate your arcology's sense of power, but also for people who want to transform others into females so that they lose all the power they have. This makes you <span class="yellowgreen">${cashFormat(_income)}.</span>`);
-		case "hedonistic":
-			_income += random(1500,2500);
-			r.push(`Since most of what the old world considered to be illegal is legal in your arcology, "smuggling" is quite common, and you easily find people ready to pay for your help with dealing with their competition. With this, you manage to make <span class="yellowgreen">${cashFormat(_income)}.</span>`);
-		case "pastoralist":
-			_income += random (1500,2500);
-			r.push(`You take advantage of your own laws, making sure that animal products still come into your arcology. But you also make sure to make them as disgusting as possible so that people would rather turn to slave-produced ones instead. This allows you to make <span class="yellowgreen">${cashFormat(_income)}.</span>`);
-		case "body purist":
-			_income += random(1500,2500);
-			r.push(`In your arcology, people are expected to be all natural, but this doesn't mean the same thing applies outside. By buying slaves, giving them implants and quickly selling them before anyone notices, you manage to make <span class="yellowgreen">${cashFormat(_income)}.</span>`);
-		case "subjugationist":
-			_income += random(1500,2500);
-			r.push(`You manage to work with some slavers that deal exclusively in ${V.arcologies[0].FSSubjugationistRace} slaves, and you export them from the arcology at a cost, bringing in <span class="yellowgreen">${cashFormat(_income)}.</span> Considering most people do not care about the fate of the slaves, they are simply mildly annoyed at the short-term raise of prices due to the exportation.`);
-		case "radicalist":
-			_income += random(2500,4000);
-			r.push(`Anal pregnancy may be accepted in your arcology, but seeing how it goes against the laws of nature makes it a gold mine for dirty businesses; you have rich slaveowners and well-known slavers come to you with their best sissies so that you can implant them with artificial uteri. This flourishing business made you <span class="yellowgreen">${cashFormat(_income)}.</span>`);
-		case "transformation":
-			_income += random(2500,4000);
-			r.push(`Your arcology is well known for its implants, and usually, one would have to pay a fortune simply to have a clinic implant them with normal implants. You take advantage of this trend to rent your remote surgery and your knowledge of gigantic implants to slavers for a cut of their profit. This gets you <span class="yellowgreen">${cashFormat(_income)}.</span>`);
-		case "youth":
-			_income += random(1500,2500);
-			r.push(`Youth is more important than anything in your arcology, yet some people who are not really in their prime are rich and powerful, enough that renting your remote surgery to them for age lifts and total body rework is quite worth it, both for them and for you. You get paid <span class="yellowgreen">${cashFormat(_income)}</span> for these services.`);
-		case "maturity":
-			_income += random(1500,2500);
-			r.push(`In your arcology, the older the slave, the better. This also means that your arcology deals a lot in curatives and preventatives, as well as less-than-legal drugs that are supposed to extend one's lifespan. You manage to ship in a few of these drugs and sell them at a high price, making you <span class="yellowgreen">${cashFormat(_income)}.</span>`);
-		case "slimness":
-			_income += random(1500,2500);
-			r.push(`Your arcology treats chubby people quite poorly, so they are ready to spend a lot of money on surgeries and supposed "miracle" solutions. When they can't afford legal and efficient methods, they have to turn to other drugs. The sales bring you <span class="yellowgreen">${cashFormat(_income)}.</span>`);
-		case "expansionist":
-			_income += random(2500,4000);
-			r.push(`Your arcology likes its slaves nice and stacked and you have exactly the drugs for it. But you always make sure to produce just a bit more, enough to not alarm anybody who might be watching, but also enough to sell to other prominent slaveowners outside your arcology, who pay you <span class="yellowgreen">${cashFormat(_income)}</span> for them.`);
-		case "idealist":
-			_income += random(1500,2500);
-			r.push(`Your society's obsession with fit and muscular slaves has developed a particular interest in steroids and all kinds of drugs to tone one's body. As an arcology owner, you always have access to the most potent of them, but this is not the case for lower class citizens; some of them just aren't willing to pay a lot for them, so they buy experimental drugs off the black market. Participating in these activities made you <span class="yellowgreen">${cashFormat(_income)}.</span>`);
-		case "professionalism":
-			_income += random(2500,5500);
-			r.push(`Your arcology has strict laws when it comes to who may be stay within its walls and those that don't cut it are often desperate for a loop hole; one you can easily provide. <span class="yellowgreen">${cashFormat(_income)}</span> for your pocket and another taxable citizen. Win, win.`);
-		case "dependency":
-			_income += random(5500,15000);
-			r.push(`Your arcology has strict laws when it comes to who may be claimed as a dependent and thusly excused from taxation. Of course, there are always those looking to cheat the system for their own benefit and more than willing to slip you a sum of credits to make it happen. While in the long term it may cost you, but for now you rake in a quick <span class="yellowgreen">${cashFormat(_income)}</span> for the forged documents.`);
-		case "statuesque":
-			_income += random(1500,3500);
-			r.push(`Your arcology likes its slaves tall, but even then there is the occasional outlier. An outlier usually keen on paying a lovely sum to have a tiny embarrassment of a slave slipped discreetly into their possession. All that is seen is a pair of suitcases changing hands and you walk away with <span class="yellowgreen">${cashFormat(_income)}.</span>`);
-		case "petite":
-			_income += random(1500,3000);
-			r.push(`Your arcology prefer a couple with a sizable gap between their heights. When they can't quite achieve that goal, they turn to any means they can. A few discreet surgeries and growth inhibitor sales net you <span class="yellowgreen">${cashFormat(_income)}</span> this week.`);
-		case "religion":
-			_income += random(2000,3000);
-			r.push(`The best smugglers know how to use the law to its advantage, and not only are you a really good smuggler, you're also the law itself. You have word spread that some company has done something blasphemous, and have them pray and pay for forgiveness. Panicked at the word of their Prophet, the higher-ups of the company give you <span class="yellowgreen">${cashFormat(_income)}</span> for salvation.`);
-		case "roman law":
-			_income += random(2000,3000);
-			r.push(`Every citizen of your arcology is trained in the art of war and supposed to defend its arcology when the time comes. This, of course, also means that people are supposed to be able to defend themselves. By arranging with the best fighters around, you manage to make some citizens face outrageous losses; so bad, in fact, that they are forced to pay <span class="yellowgreen">${cashFormat(_income)}</span> for you to forget the shame they've put on your arcology.`);
-		case "roman":
-			_income += random(1500,2500);
-			r.push(`Slaveowners from all around your arcology are rushing to the pit, eager to show their most recent training. Some of them, having more cunning than experience, are ready to sway the fight in their direction, no matter what it takes. You make sure to catch such people, and only agree to let them do their dirty tricks if they pay you. By the times the bribes and betting are done, you have made <span class="yellowgreen">${cashFormat(_income)}.</span>`);
-		case "egyptian":
-			_income += random(1500,2500);
-			r.push(`Having a society that likes incest often means that people are ready to go to great lengths to get their hands on people related to their slaves. In the smuggling business, this means that kidnapped relatives are common, and as an arcology owner with access to data on most of the slaves, you are able to control this trade a bit in exchange for <span class="yellowgreen">${cashFormat(_income)}.</span>`);
-		case "aztec law":
-			_income += random(2000,3000);
-			r.push(`People that inherit trades are sometimes too lazy to take classes in an academy, but at the same time, they fear what might happen were they to go against you. To solve both problems, you arrange a trade of fake diplomas, making sure that there is always a small detail to recognize them, so that they will get exposed in due time. This has made you <span class="yellowgreen">${cashFormat(_income)}.</span>`);
-		case "aztec":
-			_income += random(1500,2500);
-			r.push(`There are a lot of slaveowners in your arcology that tend to grow quickly attached to the slaves they planned on sacrificing to sate the blood thirst of other important citizens, and such owners often come to you, begging you to swap two of their slaves' appearance. You accept, but not for free. After the surgery, this has made you <span class="yellowgreen">${cashFormat(_income)}.</span>`);
-		case "imperial law":
-			_income += random(2000,3000);
-			r.push(`With Imperial Knights contantly patrolling the streets and a strict noble hierarchy flowing up from your Barons directly to you, you have a great deal of room to play with legal codes and edifices - which, of course, are constantly being modified to be eternally in your favor. The Barons and Knights who maintain your arcology happily turn a blind eye as you skim trade income directly into your pockets - after all, they're going to benefit from your success too. Sly manipulation of trade codes has earned you <span class="yellowgreen">${cashFormat(_income)}.</span>`);
-		case "imperial":
-			_income += random(1500,2500);
-			r.push(`Your new Imperial culture fosters a particularly large amount of trade, given its fascination with high technology and old world culture. The constant influx of new fashions, materials, and technologies allows for one of the rarest opportunities for an ultra-wealthy plutocrat such as yourself; the chance to earn an honest dollar. By spending time at the bustling marketplace and trading in fashion, you've made <span class="yellowgreen">${cashFormat(_income)}.</span>`);
-		case "arabian law":
-			_income += random(2000,3000);
-			r.push(`You have a lot of persons scared of the consequences of not being a part of your society; even if they pay the Jizya, other citizens are not forced to accept them. So if they were to get mugged in some dark alley, people would not get outraged, and there probably wouldn't be any investigations. After buying everyone's silence, you still had <span class="yellowgreen">${cashFormat(_income)}</span> to put in your pockets.`);
-		case "arabian":
-			_income += random(1500,2500);
-			r.push(`People in your arcology are supposed to keep a myriad of slaves as their personal harem, and failure to do so is considered to be highly dishonorable. This opens up some opportunities for smuggling, as people are ready to go to great length to get an edge against their competitors. Becoming a part for this business has made you <span class="yellowgreen">${cashFormat(_income)}.</span>`);
-		case "edo law":
-			_income += random(2000,3000);
-			r.push(`Outside culture is banned in your arcology. Your citizens do not need anything other than what you have inside. But this doesn't help with their curiosity — they always want to discover what the outside world is like. So you let some news and a few books from other cultures slip in, but not before you made sure they would disgust your citizens and reinforce their love for the Edo culture. The sales brought you <span class="yellowgreen">${cashFormat(_income)}.</span>`);
-		case "edo":
-			_income += random(1500,2500);
-			r.push(`During important meetings with higher society, it is wise to have a lot of slaves to put at the disposition of others. But some slaveowners grow really attached to their slaves, and so they'd much rather rent out unknown slaves from an anonymous owner's stock than use their own. This is a good opportunity to make some money, as shown by the <span class="yellowgreen">${cashFormat(_income)}</span> you managed to make.`);
-		case "chinese law":
-			_income += random(2000,3000);
-			({he, him, his} = getPronouns(S.HeadGirl));
-			r.push(`This time, you have a good idea that will also make use of your Head Girl. You coax ${him} into thinking ${he} should accept bribes for the time being, making up a good reason on the spot, and ${he} ends up bringing back <span class="yellowgreen">${cashFormat(_income)}</span> from all the bribes people gave for ${him} to turn the other way.`);
-		case "chinese":
-			_income += random(1500,2500);
-			r.push(`Being under what people call the Mandate of Heaven means you have a crucial importance in society, and some desperate people are willing to pay just for you to throw a word or small gesture in their direction, such as simply acknowledging a child or a slave, thinking that such things will make sure the Heavens smile upon them. For these services, you get <span class="yellowgreen">${cashFormat(_income)}.</span>`);
-		default:
-			_income += random(500,2000);
-			r.push(`You use former contacts to get you some opportunities in your arcology and deal with them. You make little money, only <span class="yellowgreen">${cashFormat(_income)}.</span>`);
+			case "supremacist":
+				_income += random(2000, 3000);
+				r.push(`When it comes to smuggling in your arcology, there is no better target than ${V.arcologies[0].FSSupremacistRace} slaves, and there is a high demand for them, making you a nice <span class="yellowgreen">${cashFormat(_income)}.</span> Participating in this slave trade means you can control who is set. Your people do not see things in the same light though, and <span class="red">your reputation takes a big hit.</span>`);
+				_caught = 1;
+			case "degradationist":
+				_income += random(2000, 3000);
+				r.push(`During your free time, you make business with a few low-standards slavers and manage to buy stolen slaves and sell them at a profit. Even if people recognized you, such treatment of slaves is normal, and only a few people would really complain about it. Your dealings have made you <span class="yellowgreen">${cashFormat(_income)}.</span>`);
+			case "repopulation":
+				_income += random(1500, 2500);
+				r.push(`You manage to discreetly rent out your remote surgery services for abortions. You make sure the people do not recognize your penthouse, having them come blindfolded or unconscious, should the abortion request does not come from themselves. With this, you make <span class="yellowgreen">${cashFormat(_income)}.</span>`);
+			case "fundamentalist":
+				_income += random(1500, 2500);
+				r.push(`You manage to arrange a few sex-changes and geldings in your own remote surgery for some powerful people to accommodate your arcology's sense of power, but also for people who want to transform others into females so that they lose all the power they have. This makes you <span class="yellowgreen">${cashFormat(_income)}.</span>`);
+			case "hedonistic":
+				_income += random(1500, 2500);
+				r.push(`Since most of what the old world considered to be illegal is legal in your arcology, "smuggling" is quite common, and you easily find people ready to pay for your help with dealing with their competition. With this, you manage to make <span class="yellowgreen">${cashFormat(_income)}.</span>`);
+			case "pastoralist":
+				_income += random(1500, 2500);
+				r.push(`You take advantage of your own laws, making sure that animal products still come into your arcology. But you also make sure to make them as disgusting as possible so that people would rather turn to slave-produced ones instead. This allows you to make <span class="yellowgreen">${cashFormat(_income)}.</span>`);
+			case "body purist":
+				_income += random(1500, 2500);
+				r.push(`In your arcology, people are expected to be all natural, but this doesn't mean the same thing applies outside. By buying slaves, giving them implants and quickly selling them before anyone notices, you manage to make <span class="yellowgreen">${cashFormat(_income)}.</span>`);
+			case "subjugationist":
+				_income += random(1500, 2500);
+				r.push(`You manage to work with some slavers that deal exclusively in ${V.arcologies[0].FSSubjugationistRace} slaves, and you export them from the arcology at a cost, bringing in <span class="yellowgreen">${cashFormat(_income)}.</span> Considering most people do not care about the fate of the slaves, they are simply mildly annoyed at the short-term raise of prices due to the exportation.`);
+			case "radicalist":
+				_income += random(2500, 4000);
+				r.push(`Anal pregnancy may be accepted in your arcology, but seeing how it goes against the laws of nature makes it a gold mine for dirty businesses; you have rich slaveowners and well-known slavers come to you with their best sissies so that you can implant them with artificial uteri. This flourishing business made you <span class="yellowgreen">${cashFormat(_income)}.</span>`);
+			case "transformation":
+				_income += random(2500, 4000);
+				r.push(`Your arcology is well known for its implants, and usually, one would have to pay a fortune simply to have a clinic implant them with normal implants. You take advantage of this trend to rent your remote surgery and your knowledge of gigantic implants to slavers for a cut of their profit. This gets you <span class="yellowgreen">${cashFormat(_income)}.</span>`);
+			case "youth":
+				_income += random(1500, 2500);
+				r.push(`Youth is more important than anything in your arcology, yet some people who are not really in their prime are rich and powerful, enough that renting your remote surgery to them for age lifts and total body rework is quite worth it, both for them and for you. You get paid <span class="yellowgreen">${cashFormat(_income)}</span> for these services.`);
+			case "maturity":
+				_income += random(1500, 2500);
+				r.push(`In your arcology, the older the slave, the better. This also means that your arcology deals a lot in curatives and preventatives, as well as less-than-legal drugs that are supposed to extend one's lifespan. You manage to ship in a few of these drugs and sell them at a high price, making you <span class="yellowgreen">${cashFormat(_income)}.</span>`);
+			case "slimness":
+				_income += random(1500, 2500);
+				r.push(`Your arcology treats chubby people quite poorly, so they are ready to spend a lot of money on surgeries and supposed "miracle" solutions. When they can't afford legal and efficient methods, they have to turn to other drugs. The sales bring you <span class="yellowgreen">${cashFormat(_income)}.</span>`);
+			case "expansionist":
+				_income += random(2500, 4000);
+				r.push(`Your arcology likes its slaves nice and stacked and you have exactly the drugs for it. But you always make sure to produce just a bit more, enough to not alarm anybody who might be watching, but also enough to sell to other prominent slaveowners outside your arcology, who pay you <span class="yellowgreen">${cashFormat(_income)}</span> for them.`);
+			case "idealist":
+				_income += random(1500, 2500);
+				r.push(`Your society's obsession with fit and muscular slaves has developed a particular interest in steroids and all kinds of drugs to tone one's body. As an arcology owner, you always have access to the most potent of them, but this is not the case for lower class citizens; some of them just aren't willing to pay a lot for them, so they buy experimental drugs off the black market. Participating in these activities made you <span class="yellowgreen">${cashFormat(_income)}.</span>`);
+			case "professionalism":
+				_income += random(2500, 5500);
+				r.push(`Your arcology has strict laws when it comes to who may be stay within its walls and those that don't cut it are often desperate for a loop hole; one you can easily provide. <span class="yellowgreen">${cashFormat(_income)}</span> for your pocket and another taxable citizen. Win, win.`);
+			case "dependency":
+				_income += random(5500, 15000);
+				r.push(`Your arcology has strict laws when it comes to who may be claimed as a dependent and thusly excused from taxation. Of course, there are always those looking to cheat the system for their own benefit and more than willing to slip you a sum of credits to make it happen. While in the long term it may cost you, but for now you rake in a quick <span class="yellowgreen">${cashFormat(_income)}</span> for the forged documents.`);
+			case "statuesque":
+				_income += random(1500, 3500);
+				r.push(`Your arcology likes its slaves tall, but even then there is the occasional outlier. An outlier usually keen on paying a lovely sum to have a tiny embarrassment of a slave slipped discreetly into their possession. All that is seen is a pair of suitcases changing hands and you walk away with <span class="yellowgreen">${cashFormat(_income)}.</span>`);
+			case "petite":
+				_income += random(1500, 3000);
+				r.push(`Your arcology prefer a couple with a sizable gap between their heights. When they can't quite achieve that goal, they turn to any means they can. A few discreet surgeries and growth inhibitor sales net you <span class="yellowgreen">${cashFormat(_income)}</span> this week.`);
+			case "religion":
+				_income += random(2000, 3000);
+				r.push(`The best smugglers know how to use the law to its advantage, and not only are you a really good smuggler, you're also the law itself. You have word spread that some company has done something blasphemous, and have them pray and pay for forgiveness. Panicked at the word of their Prophet, the higher-ups of the company give you <span class="yellowgreen">${cashFormat(_income)}</span> for salvation.`);
+			case "roman law":
+				_income += random(2000, 3000);
+				r.push(`Every citizen of your arcology is trained in the art of war and supposed to defend its arcology when the time comes. This, of course, also means that people are supposed to be able to defend themselves. By arranging with the best fighters around, you manage to make some citizens face outrageous losses; so bad, in fact, that they are forced to pay <span class="yellowgreen">${cashFormat(_income)}</span> for you to forget the shame they've put on your arcology.`);
+			case "roman":
+				_income += random(1500, 2500);
+				r.push(`Slaveowners from all around your arcology are rushing to the pit, eager to show their most recent training. Some of them, having more cunning than experience, are ready to sway the fight in their direction, no matter what it takes. You make sure to catch such people, and only agree to let them do their dirty tricks if they pay you. By the times the bribes and betting are done, you have made <span class="yellowgreen">${cashFormat(_income)}.</span>`);
+			case "egyptian":
+				_income += random(1500, 2500);
+				r.push(`Having a society that likes incest often means that people are ready to go to great lengths to get their hands on people related to their slaves. In the smuggling business, this means that kidnapped relatives are common, and as an arcology owner with access to data on most of the slaves, you are able to control this trade a bit in exchange for <span class="yellowgreen">${cashFormat(_income)}.</span>`);
+			case "aztec law":
+				_income += random(2000, 3000);
+				r.push(`People that inherit trades are sometimes too lazy to take classes in an academy, but at the same time, they fear what might happen were they to go against you. To solve both problems, you arrange a trade of fake diplomas, making sure that there is always a small detail to recognize them, so that they will get exposed in due time. This has made you <span class="yellowgreen">${cashFormat(_income)}.</span>`);
+			case "aztec":
+				_income += random(1500, 2500);
+				r.push(`There are a lot of slaveowners in your arcology that tend to grow quickly attached to the slaves they planned on sacrificing to sate the blood thirst of other important citizens, and such owners often come to you, begging you to swap two of their slaves' appearance. You accept, but not for free. After the surgery, this has made you <span class="yellowgreen">${cashFormat(_income)}.</span>`);
+			case "imperial law":
+				_income += random(2000, 3000);
+				r.push(`With Imperial Knights contantly patrolling the streets and a strict noble hierarchy flowing up from your Barons directly to you, you have a great deal of room to play with legal codes and edifices - which, of course, are constantly being modified to be eternally in your favor. The Barons and Knights who maintain your arcology happily turn a blind eye as you skim trade income directly into your pockets - after all, they're going to benefit from your success too. Sly manipulation of trade codes has earned you <span class="yellowgreen">${cashFormat(_income)}.</span>`);
+			case "imperial":
+				_income += random(1500, 2500);
+				r.push(`Your new Imperial culture fosters a particularly large amount of trade, given its fascination with high technology and old world culture. The constant influx of new fashions, materials, and technologies allows for one of the rarest opportunities for an ultra-wealthy plutocrat such as yourself; the chance to earn an honest dollar. By spending time at the bustling marketplace and trading in fashion, you've made <span class="yellowgreen">${cashFormat(_income)}.</span>`);
+			case "arabian law":
+				_income += random(2000, 3000);
+				r.push(`You have a lot of persons scared of the consequences of not being a part of your society; even if they pay the Jizya, other citizens are not forced to accept them. So if they were to get mugged in some dark alley, people would not get outraged, and there probably wouldn't be any investigations. After buying everyone's silence, you still had <span class="yellowgreen">${cashFormat(_income)}</span> to put in your pockets.`);
+			case "arabian":
+				_income += random(1500, 2500);
+				r.push(`People in your arcology are supposed to keep a myriad of slaves as their personal harem, and failure to do so is considered to be highly dishonorable. This opens up some opportunities for smuggling, as people are ready to go to great length to get an edge against their competitors. Becoming a part for this business has made you <span class="yellowgreen">${cashFormat(_income)}.</span>`);
+			case "edo law":
+				_income += random(2000, 3000);
+				r.push(`Outside culture is banned in your arcology. Your citizens do not need anything other than what you have inside. But this doesn't help with their curiosity — they always want to discover what the outside world is like. So you let some news and a few books from other cultures slip in, but not before you made sure they would disgust your citizens and reinforce their love for the Edo culture. The sales brought you <span class="yellowgreen">${cashFormat(_income)}.</span>`);
+			case "edo":
+				_income += random(1500, 2500);
+				r.push(`During important meetings with higher society, it is wise to have a lot of slaves to put at the disposition of others. But some slaveowners grow really attached to their slaves, and so they'd much rather rent out unknown slaves from an anonymous owner's stock than use their own. This is a good opportunity to make some money, as shown by the <span class="yellowgreen">${cashFormat(_income)}</span> you managed to make.`);
+			case "chinese law":
+				_income += random(2000, 3000);
+				({ he, him, his } = getPronouns(S.HeadGirl));
+				r.push(`This time, you have a good idea that will also make use of your Head Girl. You coax ${him} into thinking ${he} should accept bribes for the time being, making up a good reason on the spot, and ${he} ends up bringing back <span class="yellowgreen">${cashFormat(_income)}</span> from all the bribes people gave for ${him} to turn the other way.`);
+			case "chinese":
+				_income += random(1500, 2500);
+				r.push(`Being under what people call the Mandate of Heaven means you have a crucial importance in society, and some desperate people are willing to pay just for you to throw a word or small gesture in their direction, such as simply acknowledging a child or a slave, thinking that such things will make sure the Heavens smile upon them. For these services, you get <span class="yellowgreen">${cashFormat(_income)}.</span>`);
+			default:
+				_income += random(500, 2000);
+				r.push(`You use former contacts to get you some opportunities in your arcology and deal with them. You make little money, only <span class="yellowgreen">${cashFormat(_income)}.</span>`);
 		}
 		/* reputation effects */
-		if (V.rep >= 18000) {
-		r.push(` /* prestigious */`);
+		if (V.rep >= 18000) { /* prestigious */
 			r.push(`Your strong reputation makes it both really easy to find opportunities to gain quite a bit of money, but at the same time, it makes it hard to do so anonymously.`);
-			if (_caught || random(1,100) >= 25) {
+			if (_caught || random(1, 100) >= 25) {
 				r.push(`Even with your attempts at discretion, people somehow manage to recognize you, and <span class="red">rumors that you're back in the gang business</span> are spreading through your arcology like wildfire.`);
-				repX((V.rep*.8) - V.rep, "personalBusiness");
+				repX((V.rep * .8) - V.rep, "personalBusiness");
 				V.enduringRep *= .5;
-			} else if (random(1,100) >= 50) {
+			} else if (random(1, 100) >= 50) {
 				r.push(`You are as discreet as possible, but yet some people seem to have doubts about who you are, and for quite some time, you can hear whispers <span class="red">that you may be helping the shadier businesses in your arcology.</span>`);
-				repX((V.rep*.9) - V.rep, "personalBusiness");
+				repX((V.rep * .9) - V.rep, "personalBusiness");
 				V.enduringRep *= .75;
 			} else {
 				r.push(`You fool almost everyone with your `);
-	if (V.PC.actualAge >= 30) {
-		r.push(`experience and `);
-	}
-		r.push(`cunning, but the sole fact that smugglers are in your arcology <span class="red">damages your reputation.</span>`);
-				repX((V.rep*.95) - V.rep, "personalBusiness");
+				if (V.PC.actualAge >= 30) {
+					r.push(`experience and `);
+				}
+				r.push(`cunning, but the sole fact that smugglers are in your arcology <span class="red">damages your reputation.</span>`);
+				repX((V.rep * .95) - V.rep, "personalBusiness");
 				V.enduringRep *= .9;
 			}
 		} else if (V.rep >= 9000) {
-		r.push(` /* well known */`);
+			r.push(` /* well known */`);
 			r.push(`Your reputation helps you find opportunities that need people who have proved discreet. But even when taking precautions, nothing guarantees you can stay anonymous.`);
-			if (_caught || random(1,100) >= 40) {
+			if (_caught || random(1, 100) >= 40) {
 				r.push(`Try as you might, people notice who you are, and the next day, <span class="red">rumors about your business affairs</span> are already spreading everywhere in your arcology.`);
-				repX((V.rep*.9) - V.rep, "personalBusiness");
+				repX((V.rep * .9) - V.rep, "personalBusiness");
 				V.enduringRep *= .65;
-			} else if (random(1,100) >= 50) {
+			} else if (random(1, 100) >= 50) {
 				r.push(`You manage to fool some people, but not everyone, and soon enough, people are <span class="red">discussing whether you're smuggling or not.</span>`);
-				repX((V.rep*.95) - V.rep, "personalBusiness");
+				repX((V.rep * .95) - V.rep, "personalBusiness");
 				V.enduringRep *= .9;
 			} else {
 				r.push(`You somehow manage to hide your identity for all but the most cunning of people, so the only thing that really <span class="red">damages your reputation</span> is the fact that people associate you with gangs all the time.`);
-				repX((V.rep*.98) - V.rep, "personalBusiness");
+				repX((V.rep * .98) - V.rep, "personalBusiness");
 			}
 		} else {
-		r.push(` /* low reputation */`);
-			if (!_caught && random(1,100) >= 90) {
+			r.push(` /* low reputation */`);
+			if (!_caught && random(1, 100) >= 90) {
 				r.push(`You work efficiently, not spending any time talking to people more than you need. Your efficiency even managed to earn you <span class="green">quite a few good words</span> from some people who were leading double lives like you were, and they made sure to get a word in about you in their business conversations.`);
-				repX((V.rep*1.05) - V.rep, "personalBusiness");
-			} else if (!_caught && random(1,100) >= 50) {
+				repX((V.rep * 1.05) - V.rep, "personalBusiness");
+			} else if (!_caught && random(1, 100) >= 50) {
 				r.push(`You get a few curious glances from some people here and there, but most people do not care about who you are, or maybe they don't know, and it's better this way. Though your regular absences have <span class="red">not gone unnoticed</span> and some baseless rumors are spreading.`);
-				repX((V.rep*.95) - V.rep, "personalBusiness");
+				repX((V.rep * .95) - V.rep, "personalBusiness");
 				V.enduringRep *= .95;
 			} else {
 				r.push(`Some people whisper when you pass by them. They seem to know who you are, and you know that <span class="red">after a bit of alcohol, their tongue will come loose,</span> and you can't afford to shut them up right here, right now.`);
-				repX((V.rep*.9) - V.rep, "personalBusiness");
+				repX((V.rep * .9) - V.rep, "personalBusiness");
 				V.enduringRep *= .8;
 			}
 		}
-		_income += Math.trunc(Math.min(3000 * Math.log(V.cash+1), V.cash * 0.07));
+		_income += Math.trunc(Math.min(3000 * Math.log(V.cash + 1), V.cash * 0.07));
 		r.push(`This week, your illicit and legitimate business dealings earned you a combined total of <span class="yellowgreen">`);
-	cashFormat(_income)
+		cashFormat(_income)
 		r.push(`.</span>`);
 		cashX(_income, "personalBusiness");
 	} else if ((V.cash > 1000) && (V.personalAttention === "business")) {
 		if (V.PC.belly >= 1500) {
-			_income = random(500,1000);
+			_income = random(500, 1000);
 		} else {
-			_income = random(1000,1500);
+			_income = random(1000, 1500);
 		}
 		if (V.PC.skill.trading >= 100) {
 			r.push(`You focus on business and leverage your <span class="springgreen">venture capital experience</span> to make good money:`);
-			_income += random(5000,10000) + Math.trunc(Math.min(4000 * Math.log(V.cash), V.cash * 0.07));
+			_income += random(5000, 10000) + Math.trunc(Math.min(4000 * Math.log(V.cash), V.cash * 0.07));
 		} else if (V.PC.career === "arcology owner") {
 			r.push(`You focus on business and leverage your <span class="springgreen">Free Cities experience</span> to make good money:`);
-			_income += random(5000,10000) + Math.trunc(Math.min(4000 * Math.log(V.cash), V.cash * 0.07));
+			_income += random(5000, 10000) + Math.trunc(Math.min(4000 * Math.log(V.cash), V.cash * 0.07));
 		} else {
 			r.push(`You focus on business this week and make some money:`);
 			_income += Math.trunc(Math.min(3500 * Math.log(V.cash), V.cash * 0.07));
 		}
 		r.push(`<span class="yellowgreen">`);
-	cashFormat(_income)
+		cashFormat(_income)
 		r.push(`.</span>`);
 		cashX(_income, "personalBusiness");
 		if (V.arcologies[0].FSRomanRevivalist !== "unset") {
 			r.push(`Society <span class="green">approves</span> of your close attention to your own affairs; this advances your image as a `);
-	if (V.PC.title === 1) {
-		r.push(`well-rounded Roman man`);
-	} else {
-		r.push(`responsible Roman lady`);
-	}
-		r.push(`.`);
+			if (V.PC.title === 1) {
+				r.push(`well-rounded Roman man`);
+			} else {
+				r.push(`responsible Roman lady`);
+			}
+			r.push(`.`);
 			FutureSocieties.Change("RomanRevivalist", 2);
 		}
 	} else if ((V.cash > 1000)) {
 		_income = Math.trunc(Math.min(3000 * Math.log(V.cash), V.cash * 0.07));
 		r.push(`This week, your business endeavors made you <span class="yellowgreen">`);
-	cashFormat(_income)
+		cashFormat(_income)
 		r.push(`.</span>`);
 		cashX(_income, "personalBusiness");
 	} else {
@@ -464,27 +470,27 @@ App.EndWeek.personalBusiness = function() {
 	}
 
 	if (V.personalAttention === "proclamation") {
-		if (V.SecExp.proclamation.currency === "authority" && V.SecExp.core.authority >= 2000) || (V.SecExp.proclamation.currency === "reputation" && V.rep >= 4000) || (V.SecExp.proclamation.currency === "cash" && V.cash >= 8000) {
+		if ((V.SecExp.proclamation.currency === "authority" && V.SecExp.core.authority >= 2000) || (V.SecExp.proclamation.currency === "reputation" && V.rep >= 4000) || (V.SecExp.proclamation.currency === "cash" && V.cash >= 8000)) {
 			r.push(`After several days of preparation you are ready to issue the proclamation. You announce to the arcology your plans and in short order you use `);
-	if (V.SecExp.proclamation.currency === "authority") {
-		r.push(`control over the arcology`);
-	} else if (V.SecExp.proclamation.currency === "reputation") {
-		r.push(`great influence`);
-	} else if (V.SecExp.proclamation.currency === "cash") {
-		r.push(` vast financial means`);
-	}
-		r.push(` to`);
+			if (V.SecExp.proclamation.currency === "authority") {
+				r.push(`control over the arcology`);
+			} else if (V.SecExp.proclamation.currency === "reputation") {
+				r.push(`great influence`);
+			} else if (V.SecExp.proclamation.currency === "cash") {
+				r.push(` vast financial means`);
+			}
+			r.push(` to`);
 			if (V.SecExp.proclamation.type === "security") {
 				r.push(`gather crucial information for your security department. In just a few many hours holes are plugged and most moles are eliminated. <span class="green">Your security greatly increased.</span>`);
-				V.SecExp.core.security = Math.clamp(V.SecExp.core.security + 25,0,100);
+				V.SecExp.core.security = Math.clamp(V.SecExp.core.security + 25, 0, 100);
 			} else if (V.SecExp.proclamation.type === "crime") {
 				r.push(`force the arrest of many suspected citizens. Their personal power allowed them to avoid justice for a long time, but this day is their end. <span class="green">Your crime greatly decreased.</span>`);
-				V.SecExp.core.crimeLow = Math.clamp(V.SecExp.core.crimeLow - 25,0,100);
+				V.SecExp.core.crimeLow = Math.clamp(V.SecExp.core.crimeLow - 25, 0, 100);
 			}
 			if (V.SecExp.proclamation.currency === "authority") {
-				V.SecExp.core.authority = Math.clamp(V.SecExp.core.authority - 2000,0,20000);
+				V.SecExp.core.authority = Math.clamp(V.SecExp.core.authority - 2000, 0, 20000);
 			} else if (V.SecExp.proclamation.currency === "reputation") {
-				repX(Math.clamp(V.rep - 2000,0,20000), "personalBusiness");
+				repX(Math.clamp(V.rep - 2000, 0, 20000), "personalBusiness");
 			} else {
 				cashX(-8000, "personalBusiness");
 			}
@@ -494,274 +500,269 @@ App.EndWeek.personalBusiness = function() {
 		}
 	}
 
-
 	if (V.PC.actualAge >= V.IsInPrimePC && V.PC.actualAge < V.IsPastPrimePC) {
-		_Cal = Math.ceil(random(V.AgeTrainingLowerBoundPC,V.AgeTrainingUpperBoundPC)*V.AgeEffectOnTrainerEffectivenessPC);
+		_Cal = Math.ceil(random(V.AgeTrainingLowerBoundPC, V.AgeTrainingUpperBoundPC) * V.AgeEffectOnTrainerEffectivenessPC);
 		_X = 1;
 	}
-	/* if V.PC.actualAge >= V.IsPastPrimePC {
-		r.push(` */`);
-		/* _Cal = Math.ceil(random(V.AgeTrainingLowerBoundPC,V.AgeTrainingUpperBoundPC)*V.AgeEffectOnTrainerEffectivenessPC);
-		r.push(` */`);
-		/* _X = 0;
-		r.push(` */`);
-	/* }
-		r.push(` */`);
+	/*
+	if V.PC.actualAge >= V.IsPastPrimePC {
+		_Cal = Math.ceil(random(V.AgeTrainingLowerBoundPC,V.AgeTrainingUpperBoundPC)*V.AgeEffectOnTrainerEffectivenessPC);
+		_X = 0;
+	}
+	*/
 
 	if (V.PC.health.shortDamage < 30) {
+		let _oldSkill;
 		switch (V.personalAttention) {
-		case "trading":
-			_oldSkill = V.PC.skill.trading;
-			if (_X === 1) {
-				V.PC.skill.trading += _Cal;
-			} else {
-				V.PC.skill.trading -= _Cal;
-			}
-			if (_oldSkill <= 10) {
-				if (V.PC.skill.trading > 10) {
-					r.push(`You now have <span class="green">basic knowledge</span> about how to be a venture capitalist.`);
-				} else {
-					r.push(`You have made progress towards a basic knowledge of venture capitalism.`);
-				}
-			} else if (_oldSkill <= 30) {
-				if (V.PC.skill.trading > 30) {
-					r.push(`You now have <span class="green">some skill</span> as a venture capitalist.`);
-				} else {
-					r.push(`You have made progress towards being skilled in venture capitalism.`);
-				}
-			} else if (_oldSkill <= 60) {
-				if (V.PC.skill.trading > 60) {
-					r.push(`You are now an <span class="green">expert venture capitalist.</span>`);
+			case "trading":
+				_oldSkill = V.PC.skill.trading;
+				if (_X === 1) {
+					V.PC.skill.trading += _Cal;
 				} else {
-					r.push(`You have made progress towards being an expert in venture capitalism.`);
+					V.PC.skill.trading -= _Cal;
 				}
-			} else {
-				if (V.PC.skill.trading >= 100) {
-					V.personalAttention = "sex";
-					r.push(`You are now a <span class="green">master venture capitalist.</span>`);
+				if (_oldSkill <= 10) {
+					if (V.PC.skill.trading > 10) {
+						r.push(`You now have <span class="green">basic knowledge</span> about how to be a venture capitalist.`);
+					} else {
+						r.push(`You have made progress towards a basic knowledge of venture capitalism.`);
+					}
+				} else if (_oldSkill <= 30) {
+					if (V.PC.skill.trading > 30) {
+						r.push(`You now have <span class="green">some skill</span> as a venture capitalist.`);
+					} else {
+						r.push(`You have made progress towards being skilled in venture capitalism.`);
+					}
+				} else if (_oldSkill <= 60) {
+					if (V.PC.skill.trading > 60) {
+						r.push(`You are now an <span class="green">expert venture capitalist.</span>`);
+					} else {
+						r.push(`You have made progress towards being an expert in venture capitalism.`);
+					}
 				} else {
-					r.push(`You have made progress towards mastering venture capitalism.`);
+					if (V.PC.skill.trading >= 100) {
+						V.personalAttention = "sex";
+						r.push(`You are now a <span class="green">master venture capitalist.</span>`);
+					} else {
+						r.push(`You have made progress towards mastering venture capitalism.`);
+					}
 				}
-			}
 
-		case "warfare":
-			_oldSkill = V.PC.skill.warfare;
-			if (_X === 1) {
-				V.PC.skill.warfare += _Cal;
-			} else {
-				V.PC.skill.warfare -= _Cal;
-			}
-			if (_oldSkill <= 10) {
-				if (V.PC.skill.warfare > 10) {
-					r.push(`You now have <span class="green">basic knowledge</span> about how to be a mercenary.`);
+			case "warfare":
+				_oldSkill = V.PC.skill.warfare;
+				if (_X === 1) {
+					V.PC.skill.warfare += _Cal;
 				} else {
-					r.push(`You have made progress towards a basic knowledge of mercenary work.`);
+					V.PC.skill.warfare -= _Cal;
 				}
-			} else if (_oldSkill <= 30) {
-				if (V.PC.skill.warfare > 30) {
-					r.push(`You now have <span class="green">some skill</span> as a mercenary.`);
-				} else {
-					r.push(`You have made progress towards being skilled in mercenary work.`);
-				}
-			} else if (_oldSkill <= 60) {
-				if (V.PC.skill.warfare > 60) {
-					r.push(`You are now an <span class="green">expert mercenary.</span>`);
-				} else {
-					r.push(`You have made progress towards being an expert in mercenary work.`);
-				}
-			} else {
-				if (V.PC.skill.warfare >= 100) {
-					V.personalAttention = "sex";
-					r.push(`You are now a <span class="green">master mercenary.</span>`);
+				if (_oldSkill <= 10) {
+					if (V.PC.skill.warfare > 10) {
+						r.push(`You now have <span class="green">basic knowledge</span> about how to be a mercenary.`);
+					} else {
+						r.push(`You have made progress towards a basic knowledge of mercenary work.`);
+					}
+				} else if (_oldSkill <= 30) {
+					if (V.PC.skill.warfare > 30) {
+						r.push(`You now have <span class="green">some skill</span> as a mercenary.`);
+					} else {
+						r.push(`You have made progress towards being skilled in mercenary work.`);
+					}
+				} else if (_oldSkill <= 60) {
+					if (V.PC.skill.warfare > 60) {
+						r.push(`You are now an <span class="green">expert mercenary.</span>`);
+					} else {
+						r.push(`You have made progress towards being an expert in mercenary work.`);
+					}
 				} else {
-					r.push(`You have made progress towards mastering mercenary work.`);
+					if (V.PC.skill.warfare >= 100) {
+						V.personalAttention = "sex";
+						r.push(`You are now a <span class="green">master mercenary.</span>`);
+					} else {
+						r.push(`You have made progress towards mastering mercenary work.`);
+					}
 				}
-			}
 
-		case "slaving":
-			_oldSkill = V.PC.skill.slaving;
-			if (_X === 1) {
-				V.PC.skill.slaving += _Cal;
-			} else {
-				V.PC.skill.slaving -= _Cal;
-			}
-			if (_oldSkill <= 10) {
-				if (V.PC.skill.slaving > 10) {
-					r.push(`You now have <span class="green">basic knowledge</span> about how to be a slaver.`);
+			case "slaving":
+				_oldSkill = V.PC.skill.slaving;
+				if (_X === 1) {
+					V.PC.skill.slaving += _Cal;
 				} else {
-					r.push(`You have made progress towards a basic knowledge of slaving.`);
+					V.PC.skill.slaving -= _Cal;
 				}
-			} else if (_oldSkill <= 30) {
-				if (V.PC.skill.slaving > 30) {
-					r.push(`You now have <span class="green">some skill</span> as a slaver.`);
-				} else {
-					r.push(`You have made progress towards being skilled in slaving.`);
-				}
-			} else if (_oldSkill <= 60) {
-				if (V.PC.skill.slaving > 60) {
-					r.push(`You are now an <span class="green">expert slaver.</span>`);
-				} else {
-					r.push(`You have made progress towards being an expert in slaving.`);
-				}
-			} else {
-				if (V.PC.skill.slaving >= 100) {
-					V.personalAttention = "sex";
-					r.push(`You are now a <span class="green">master slaver.</span>`);
+				if (_oldSkill <= 10) {
+					if (V.PC.skill.slaving > 10) {
+						r.push(`You now have <span class="green">basic knowledge</span> about how to be a slaver.`);
+					} else {
+						r.push(`You have made progress towards a basic knowledge of slaving.`);
+					}
+				} else if (_oldSkill <= 30) {
+					if (V.PC.skill.slaving > 30) {
+						r.push(`You now have <span class="green">some skill</span> as a slaver.`);
+					} else {
+						r.push(`You have made progress towards being skilled in slaving.`);
+					}
+				} else if (_oldSkill <= 60) {
+					if (V.PC.skill.slaving > 60) {
+						r.push(`You are now an <span class="green">expert slaver.</span>`);
+					} else {
+						r.push(`You have made progress towards being an expert in slaving.`);
+					}
 				} else {
-					r.push(`You have made progress towards mastering slaving.`);
+					if (V.PC.skill.slaving >= 100) {
+						V.personalAttention = "sex";
+						r.push(`You are now a <span class="green">master slaver.</span>`);
+					} else {
+						r.push(`You have made progress towards mastering slaving.`);
+					}
 				}
-			}
 
-		case "engineering":
-			_oldSkill = V.PC.skill.engineering;
-			if (_X === 1) {
-				V.PC.skill.engineering += _Cal;
-			} else {
-				V.PC.skill.engineering -= _Cal;
-			}
-			if (_oldSkill <= 10) {
-				if (V.PC.skill.engineering > 10) {
-					r.push(`You now have <span class="green">basic knowledge</span> about how to be an arcology engineer.`);
-				} else {
-					r.push(`You have made progress towards a basic knowledge of arcology engineering.`);
-				}
-			} else if (_oldSkill <= 30) {
-				if (V.PC.skill.engineering > 30) {
-					r.push(`You now have <span class="green">some skill</span> as an arcology engineer.`);
-				} else {
-					r.push(`You have made progress towards being skilled in arcology engineering.`);
-				}
-			} else if (_oldSkill <= 60) {
-				if (V.PC.skill.engineering > 60) {
-					r.push(`You are now an <span class="green">expert arcology engineer.</span>`);
+			case "engineering":
+				_oldSkill = V.PC.skill.engineering;
+				if (_X === 1) {
+					V.PC.skill.engineering += _Cal;
 				} else {
-					r.push(`You have made progress towards being an expert in arcology engineering.`);
+					V.PC.skill.engineering -= _Cal;
 				}
-			} else {
-				if (V.PC.skill.engineering >= 100) {
-					V.personalAttention = "sex";
-					r.push(`You are now a <span class="green">master arcology engineer.</span>`);
+				if (_oldSkill <= 10) {
+					if (V.PC.skill.engineering > 10) {
+						r.push(`You now have <span class="green">basic knowledge</span> about how to be an arcology engineer.`);
+					} else {
+						r.push(`You have made progress towards a basic knowledge of arcology engineering.`);
+					}
+				} else if (_oldSkill <= 30) {
+					if (V.PC.skill.engineering > 30) {
+						r.push(`You now have <span class="green">some skill</span> as an arcology engineer.`);
+					} else {
+						r.push(`You have made progress towards being skilled in arcology engineering.`);
+					}
+				} else if (_oldSkill <= 60) {
+					if (V.PC.skill.engineering > 60) {
+						r.push(`You are now an <span class="green">expert arcology engineer.</span>`);
+					} else {
+						r.push(`You have made progress towards being an expert in arcology engineering.`);
+					}
 				} else {
-					r.push(`You have made progress towards mastering arcology engineering.`);
+					if (V.PC.skill.engineering >= 100) {
+						V.personalAttention = "sex";
+						r.push(`You are now a <span class="green">master arcology engineer.</span>`);
+					} else {
+						r.push(`You have made progress towards mastering arcology engineering.`);
+					}
 				}
-			}
 
-		case "medicine":
-			_oldSkill = V.PC.skill.medicine;
-			if (_X === 1) {
-				V.PC.skill.medicine += _Cal;
-			} else {
-				V.PC.skill.medicine -= _Cal;
-			}
-			if (_oldSkill <= 10) {
-				if (V.PC.skill.medicine > 10) {
-					r.push(`You now have <span class="green">basic knowledge</span> about how to be a slave surgeon.`);
-				} else {
-					r.push(`You have made progress towards a basic knowledge of slave surgery.`);
-				}
-			} else if (_oldSkill <= 30) {
-				if (V.PC.skill.medicine > 30) {
-					r.push(`You now have <span class="green">some skill</span> as a slave surgeon.`);
-				} else {
-					r.push(`You have made progress towards being skilled in slave surgery.`);
-				}
-			} else if (_oldSkill <= 60) {
-				if (V.PC.skill.medicine > 60) {
-					r.push(`You are now an <span class="green">expert slave surgeon.</span>`);
+			case "medicine":
+				_oldSkill = V.PC.skill.medicine;
+				if (_X === 1) {
+					V.PC.skill.medicine += _Cal;
 				} else {
-					r.push(`You have made progress towards being an expert in slave surgery.`);
+					V.PC.skill.medicine -= _Cal;
 				}
-			} else {
-				if (V.PC.skill.medicine >= 100) {
-					V.personalAttention = "sex";
-					r.push(`You are now a <span class="green">master slave surgeon.</span>`);
+				if (_oldSkill <= 10) {
+					if (V.PC.skill.medicine > 10) {
+						r.push(`You now have <span class="green">basic knowledge</span> about how to be a slave surgeon.`);
+					} else {
+						r.push(`You have made progress towards a basic knowledge of slave surgery.`);
+					}
+				} else if (_oldSkill <= 30) {
+					if (V.PC.skill.medicine > 30) {
+						r.push(`You now have <span class="green">some skill</span> as a slave surgeon.`);
+					} else {
+						r.push(`You have made progress towards being skilled in slave surgery.`);
+					}
+				} else if (_oldSkill <= 60) {
+					if (V.PC.skill.medicine > 60) {
+						r.push(`You are now an <span class="green">expert slave surgeon.</span>`);
+					} else {
+						r.push(`You have made progress towards being an expert in slave surgery.`);
+					}
 				} else {
-					r.push(`You have made progress towards mastering slave surgery.`);
+					if (V.PC.skill.medicine >= 100) {
+						V.personalAttention = "sex";
+						r.push(`You are now a <span class="green">master slave surgeon.</span>`);
+					} else {
+						r.push(`You have made progress towards mastering slave surgery.`);
+					}
 				}
-			}
 
-		case "hacking":
-			_oldSkill = V.PC.skill.hacking;
-			if (_X === 1) {
-				V.PC.skill.hacking += _Cal;
-			} else {
-				V.PC.skill.hacking -= _Cal;
-			}
-			if (_oldSkill <= 10) {
-				if (V.PC.skill.hacking > 10) {
-					r.push(`You now have <span class="green">basic knowledge</span> about how to hack and manipulate data.`);
+			case "hacking":
+				_oldSkill = V.PC.skill.hacking;
+				if (_X === 1) {
+					V.PC.skill.hacking += _Cal;
 				} else {
-					r.push(`You have made progress towards a basic knowledge of hacking and data manipulation.`);
+					V.PC.skill.hacking -= _Cal;
 				}
-			} else if (_oldSkill <= 30) {
-				if (V.PC.skill.hacking > 30) {
-					r.push(`You now have <span class="green">some skill</span> as a hacker.`);
-				} else {
-					r.push(`You have made progress towards being skilled in hacking and data manipulation.`);
-				}
-			} else if (_oldSkill <= 60) {
-				if (V.PC.skill.hacking > 60) {
-					r.push(`You are now an <span class="green">expert hacker.</span>`);
-				} else {
-					r.push(`You have made progress towards being an expert in hacking and data manipulation.`);
-				}
-			} else {
-				if (V.PC.skill.hacking >= 100) {
-					V.personalAttention = "sex";
-					r.push(`You are now a <span class="green">master hacker.</span>`);
+				if (_oldSkill <= 10) {
+					if (V.PC.skill.hacking > 10) {
+						r.push(`You now have <span class="green">basic knowledge</span> about how to hack and manipulate data.`);
+					} else {
+						r.push(`You have made progress towards a basic knowledge of hacking and data manipulation.`);
+					}
+				} else if (_oldSkill <= 30) {
+					if (V.PC.skill.hacking > 30) {
+						r.push(`You now have <span class="green">some skill</span> as a hacker.`);
+					} else {
+						r.push(`You have made progress towards being skilled in hacking and data manipulation.`);
+					}
+				} else if (_oldSkill <= 60) {
+					if (V.PC.skill.hacking > 60) {
+						r.push(`You are now an <span class="green">expert hacker.</span>`);
+					} else {
+						r.push(`You have made progress towards being an expert in hacking and data manipulation.`);
+					}
 				} else {
-					r.push(`You have made progress towards mastering hacking and data manipulation.`);
+					if (V.PC.skill.hacking >= 100) {
+						V.personalAttention = "sex";
+						r.push(`You are now a <span class="green">master hacker.</span>`);
+					} else {
+						r.push(`You have made progress towards mastering hacking and data manipulation.`);
+					}
 				}
-			}
 
-		case "technical accidents":
-			_windfall = Math.trunc((150*V.PC.skill.hacking)+random(100,2500)), _X = 0;
-			if (V.PC.skill.hacking === -100) {
-				_Catchtchance = 10;
-			} else if (V.PC.skill.hacking <= -75) {
-				_Catchtchance = 30;
-			} else if (V.PC.skill.hacking <= -50) {
-				_Catchtchance = 40;
-			} else if (V.PC.skill.hacking <= -25) {
-				_Catchtchance = 45;
-			} else if (V.PC.skill.hacking === 0) {
-				_Catchtchance = 50;
-			} else if (V.PC.skill.hacking <= 25) {
-				_Catchtchance = 60;
-			} else if (V.PC.skill.hacking <= 50) {
-				_Catchtchance = 70;
-			} else if (V.PC.skill.hacking <= 75) {
-				_Catchtchance = 85;
-			} else if (V.PC.skill.hacking >= 100) {
-				_Catchtchance = 100;
-			}
-			r.push(`This week your services to the highest bidder earned you <span class="yellowgreen">`);
-	cashFormat(_windfall)
-		r.push(`.</span>`);
-			if (random(0,100) >= _Catchtchance) {
-				r.push(`However, since the source of the attack was traced back to your arcology, your`);
-				if (V.secExpEnabled > 0) {
-		r.push(` `);
-	_X = 1;
-					r.push(`<span class="red">authority,</span> `);
-	V.SecExp.core.authority -= random(100,500);
-		r.push(` <span class="red">crime rate</span> `);
-	V.SecExp.core.crimeLow += random(10,25);
-		r.push(` and`);
+			case "technical accidents":
+				_windfall = Math.trunc((150 * V.PC.skill.hacking) + random(100, 2500)), _X = 0;
+				if (V.PC.skill.hacking === -100) {
+					_Catchtchance = 10;
+				} else if (V.PC.skill.hacking <= -75) {
+					_Catchtchance = 30;
+				} else if (V.PC.skill.hacking <= -50) {
+					_Catchtchance = 40;
+				} else if (V.PC.skill.hacking <= -25) {
+					_Catchtchance = 45;
+				} else if (V.PC.skill.hacking === 0) {
+					_Catchtchance = 50;
+				} else if (V.PC.skill.hacking <= 25) {
+					_Catchtchance = 60;
+				} else if (V.PC.skill.hacking <= 50) {
+					_Catchtchance = 70;
+				} else if (V.PC.skill.hacking <= 75) {
+					_Catchtchance = 85;
+				} else if (V.PC.skill.hacking >= 100) {
+					_Catchtchance = 100;
 				}
-				r.push(`<span class="red">reputation</span> `);
-	repX(forceNeg(random(50,500)), "event");
-				if (_X !== 1) {
-					r.push(`has`);
-				} else {
-					r.push(`have all`);
+				r.push(`This week your services to the highest bidder earned you <span class="yellowgreen">${cashFormat(_windfall)}.</span>`);
+				if (random(0, 100) >= _Catchtchance) {
+					r.push(`However, since the source of the attack was traced back to your arcology, your`);
+					if (V.secExpEnabled > 0) {
+						_X = 1;
+						r.push(`<span class="red">authority,</span> `);
+						V.SecExp.core.authority -= random(100, 500);
+						r.push(` <span class="red">crime rate</span> `);
+						V.SecExp.core.crimeLow += random(10, 25);
+						r.push(` and`);
+					}
+					r.push(`<span class="red">reputation</span> `);
+					repX(forceNeg(random(50, 500)), "event");
+					if (_X !== 1) {
+						r.push(`has`);
+					} else {
+						r.push(`have all`);
+					}
+					r.push(`been negatively affected.`);
 				}
-				r.push(`been negatively affected.`);
-			}
-			if (V.PC.skill.hacking < 100) {
-				r.push(`${V.IncreasePCSkills(}'hacking', 0.5)`);
-			}
-			cashX(_windfall, "personalBusiness");
+				if (V.PC.skill.hacking < 100) {
+					r.push(`${IncreasePCSkills('hacking', 0.5)}`);
+				}
+				cashX(_windfall, "personalBusiness");
 
 		}
 	}
@@ -769,8 +770,8 @@ App.EndWeek.personalBusiness = function() {
 	if (V.policies.cashForRep === 1) {
 		if (V.cash > 1000) {
 			r.push(`This week you gave up business opportunities worth `);
-	cashFormat(policies.cost())
-		r.push(` to help deserving citizens, <span class="green">burnishing your reputation.</span>`);
+			cashFormat(policies.cost())
+			r.push(` to help deserving citizens, <span class="green">burnishing your reputation.</span>`);
 			repX(1000, "personalBusiness");
 			cashX(forceNeg(policies.cost()), "policies");
 			if (V.PC.degeneracy > 1) {
@@ -784,13 +785,13 @@ App.EndWeek.personalBusiness = function() {
 	if (V.policies.goodImageCampaign === 1) {
 		if (V.cash > 5000) {
 			r.push(`This week you paid `);
-	cashFormat(policies.cost())
-		r.push(` to have positive rumors spread about you, <span class="green">making you look good`);
-	if (V.PC.degeneracy > 1) {
-		r.push(` and weakening existing undesirable rumors`);
-	V.PC.degeneracy -= 2;
-	}
-		r.push(`.</span>`);
+			cashFormat(policies.cost())
+			r.push(` to have positive rumors spread about you, <span class="green">making you look good`);
+			if (V.PC.degeneracy > 1) {
+				r.push(` and weakening existing undesirable rumors`);
+				V.PC.degeneracy -= 2;
+			}
+			r.push(`.</span>`);
 			repX(500, "personalBusiness");
 			cashX(forceNeg(policies.cost()), "policies");
 		} else {
@@ -800,8 +801,8 @@ App.EndWeek.personalBusiness = function() {
 	if (V.rep > 20) {
 		if (V.policies.cashForRep === -1) {
 			r.push(`This week you used your position to secure business opportunities worth `);
-	cashFormat(policies.cost())
-		r.push(` at the expense of citizens, <span class="red">damaging your reputation.</span>`);
+			cashFormat(policies.cost())
+			r.push(` at the expense of citizens, <span class="red">damaging your reputation.</span>`);
 			repX(-20, "personalBusiness");
 			cashX(policies.cost(), "personalBusiness");
 		}
@@ -818,9 +819,9 @@ App.EndWeek.personalBusiness = function() {
 	}
 
 	if (V.secExpEnabled > 0) {
-		if (V.SecExp.smilingMan.progress === 10 && random(1,100) >= 85) {
+		if (V.SecExp.smilingMan.progress === 10 && random(1, 100) >= 85) {
 			r.push(`This week one of the offside adventures of The Smiling Man produced a copious amount of money, of which <span class="yellowgreen">you receive your share.</span>`);
-			cashX(random(10,20) * 1000, "personalBusiness");
+			cashX(random(10, 20) * 1000, "personalBusiness");
 		}
 
 		if (V.SecExp.buildings.secHub && V.SecExp.edicts.sellData === 1) {
@@ -831,11 +832,10 @@ App.EndWeek.personalBusiness = function() {
 
 			_dataGain = _upgradeCount * 200;
 			if (!Number.isInteger(_dataGain)) {
-				<br><span class="red">Error, dataGain is NaN</span>
+				//<br>
+				r.push(`<span class="red">Error, dataGain is NaN</span>`);
 			} else {
-				r.push(`You are selling the data collected by your security department, which earns a discreet sum of <span class="yellowgreen">`);
-	cashFormat(_dataGain)
-		r.push(`.</span>`);
+				r.push(`You are selling the data collected by your security department, which earns a discreet sum of <span class="yellowgreen">${cashFormat(_dataGain)}.</span>`);
 				cashX(_dataGain, "personalBusiness");
 				r.push(`Many of your citizens are not enthusiastic of this however, <span class="red">damaging your authority.</span>`);
 				V.SecExp.core.authority -= 50;
@@ -843,36 +843,35 @@ App.EndWeek.personalBusiness = function() {
 		}
 
 		if (V.SecExp.buildings.propHub && V.SecExp.buildings.propHub.upgrades.marketInfiltration > 0) {
-			_blackMarket = random(7000,8000);
-			r.push(`Your secret service makes use of black markets and illegal streams of goods to make a profit, making you <span class="yellowgreen">`);
-	cashFormat(_blackMarket)
-		r.push(`.</span> This however allows <span class="red">crime to flourish</span> in the underbelly of the arcology.`);
-			V.SecExp.core.crimeLow += random(1,3);
+			const _blackMarket = random(7000, 8000);
+			r.push(`Your secret service makes use of black markets and illegal streams of goods to make a profit, making you <span class="yellowgreen">${cashFormat(_blackMarket)}.</span> This however allows <span class="red">crime to flourish</span> in the underbelly of the arcology.`);
+			V.SecExp.core.crimeLow += random(1, 3);
 			cashX(_blackMarket, "personalBusiness");
 		}
 
 		if (V.arcRepairTime > 0) {
 			r.push(`The recent rebellion left the arcology wounded and it falls to its owner to fix it. It will still take `);
-	if (V.arcRepairTime > 1) {
-		r.push(`${V.arcRepairTime} weeks`);
-	} else {
-		r.push(`a week`);
-	}
-		r.push(` to finish repair works.`);
+			if (V.arcRepairTime > 1) {
+				r.push(`${V.arcRepairTime} weeks`);
+			} else {
+				r.push(`a week`);
+			}
+			r.push(` to finish repair works.`);
 			cashX(-5000, "personalBusiness");
 			V.arcRepairTime--, IncreasePCSkills('engineering', 0.1);
 		}
 
 		if (V.SecExp.buildings.weapManu) {
-			<br><br>The weapons manufacturing complex produces armaments
+			//<br><br>
+			r.push(`The weapons manufacturing complex produces armaments`);
 			if (V.SecExp.buildings.weapManu.productivity <= 2) {
-		r.push(` at a steady pace.`);
+				r.push(` at a steady pace.`);
 			} else {
-		r.push(` with great efficiency.`);
+				r.push(` with great efficiency.`);
 			}
 			_income = 0;
-			_price = Math.trunc(Math.clamp(random(1,2) + (V.arcologies[0].prosperity / 15) - (V.week / 30), 2, 8));
-			_factoryMod = Math.round(1 + (V.SecExp.buildings.weapManu.productivity + V.SecExp.buildings.weapManu.lab) / 2 + (V.SecExp.buildings.weapManu.menials / 100));
+			let _price = Math.trunc(Math.clamp(random(1, 2) + (V.arcologies[0].prosperity / 15) - (V.week / 30), 2, 8));
+			let _factoryMod = Math.round(1 + (V.SecExp.buildings.weapManu.productivity + V.SecExp.buildings.weapManu.lab) / 2 + (V.SecExp.buildings.weapManu.menials / 100));
 			if (V.SecExp.buildings.weapManu.sellTo.citizen === 1) {
 				if (V.SecExp.edicts.weaponsLaw === 3) {
 					r.push(`Your lax regulations regarding weapons allows your citizens to buy much of what you are capable of producing.`);
@@ -902,50 +901,43 @@ App.EndWeek.personalBusiness = function() {
 			}
 			_income = Math.trunc(_income * 0.5);
 			r.push(`This week we made <span class="yellowgreen">`);
-	cashFormat(_income)
-		r.push(`.</span>`);
+			cashFormat(_income)
+			r.push(`.</span>`);
 			if (!Number.isInteger(_income)) {
-				<br><span class="red">Error failed to calculate income</span>
+				//<br>
+				r.push(`<span class="red">Error failed to calculate income</span>`);
 			} else {
 				cashX(_income, "personalBusiness");
 			}
 		}
 
 		if (V.SecExp.edicts.taxTrade === 1) {
-		r.push(` `);
-	_tradeTax = Math.ceil(V.SecExp.core.trade * random(80,120));
-			<br>Fees on transitioning goods this week made <span class="yellowgreen">
-	cashFormat(_tradeTax)
-		r.push(`.</span>`);
+			const _tradeTax = Math.ceil(V.SecExp.core.trade * random(80, 120));
+			//<br>
+			r.push(`Fees on transitioning goods this week made <span class="yellowgreen">${cashFormat(_tradeTax)}.</span>`);
 			cashX(Math.ceil(_tradeTax), "personalBusiness");
 		}
-		<br>
+		//<br>
 	}
 
-	Routine upkeep of your demesne costs <span class="yellow">
-	cashFormat(V.costs)
-		r.push(`.</span>`);
+	r.push(`Routine upkeep of your demesne costs <span class="yellow">${cashFormat(V.costs)}.</span>`);
 	if (V.plot === 1) {
 		if (V.week > 10) {
-			if (V.weatherToday.severity-V.weatherCladding > 2) {
+			if (V.weatherToday.severity - V.weatherCladding > 2) {
 				V.weatherAwareness = 1;
+				let _weatherRepairCost;
 				if (V.weatherCladding === 1) {
-					_weatherRepairCost = Math.trunc(((V.weatherToday.severity-3)*(V.arcologies[0].prosperity*random(50,100)))+random(1,100)), IncreasePCSkills('engineering', 0.1);
-					r.push(`${V.arcologies[0].name}'s hardened exterior only partially resisted the extreme weather this week, and it requires repairs costing <span class="yellow">`);
-	cashFormat(_weatherRepairCost)
-		r.push(`.</span> Your citizens are <span class="green">grateful</span> to you for upgrading ${V.arcologies[0].name} to provide a safe haven from the terrible climate.`);
+					_weatherRepairCost = Math.trunc(((V.weatherToday.severity - 3) * (V.arcologies[0].prosperity * random(50, 100))) + random(1, 100));
+					IncreasePCSkills('engineering', 0.1);
+					r.push(`${V.arcologies[0].name}'s hardened exterior only partially resisted the extreme weather this week, and it requires repairs costing <span class="yellow">${cashFormat(_weatherRepairCost)}.</span> Your citizens are <span class="green">grateful</span> to you for upgrading ${V.arcologies[0].name} to provide a safe haven from the terrible climate.`);
 					repX(500, "architecture");
 				} else if (V.weatherCladding === 2) {
-					_weatherRepairCost to Math.trunc(((V.weatherToday.severity-4)*(V.arcologies[0].prosperity*random(50,100)))+random(1,100)), IncreasePCSkills('engineering', 0.1);
-					r.push(`${V.arcologies[0].name}'s hardened exterior only partially resisted the extreme weather this week, and it requires repairs costing <span class="yellow">`);
-	cashFormat(_weatherRepairCost)
-		r.push(`.</span> Your citizens are <span class="green">grateful</span> to you for upgrading ${V.arcologies[0].name} to provide a safe haven from the terrible climate.`);
+					_weatherRepairCost = Math.trunc(((V.weatherToday.severity - 4) * (V.arcologies[0].prosperity * random(50, 100))) + random(1, 100)), IncreasePCSkills('engineering', 0.1);
+					r.push(`${V.arcologies[0].name}'s hardened exterior only partially resisted the extreme weather this week, and it requires repairs costing <span class="yellow">${cashFormat(_weatherRepairCost)}.</span> Your citizens are <span class="green">grateful</span> to you for upgrading ${V.arcologies[0].name} to provide a safe haven from the terrible climate.`);
 					repX(500, "architecture");
 				} else {
-					_weatherRepairCost = Math.trunc(((V.weatherToday.severity-2)*(V.arcologies[0].prosperity*random(50,100)))+random(1,100)), IncreasePCSkills('engineering', 0.1);
-					r.push(`Severe weather damaged the arcology this week, requiring repairs costing <span class="yellow">`);
-	cashFormat(_weatherRepairCost)
-		r.push(`.</span> Your citizens are <span class="red">unhappy</span> that the arcology has proven vulnerable to the terrible climate.`);
+					_weatherRepairCost = Math.trunc(((V.weatherToday.severity - 2) * (V.arcologies[0].prosperity * random(50, 100))) + random(1, 100)), IncreasePCSkills('engineering', 0.1);
+					r.push(`Severe weather damaged the arcology this week, requiring repairs costing <span class="yellow">${cashFormat(_weatherRepairCost)}.</span> Your citizens are <span class="red">unhappy</span> that the arcology has proven vulnerable to the terrible climate.`);
 					repX(-50, "architecture");
 				}
 				if (V.cash > 0) {
@@ -957,19 +949,19 @@ App.EndWeek.personalBusiness = function() {
 						V.failedElite += 100;
 					}
 					if (V.arcologies[0].prosperity > 50) {
-						V.arcologies[0].prosperity -= random(5,10), IncreasePCSkills('engineering', 0.1);
+						V.arcologies[0].prosperity -= random(5, 10), IncreasePCSkills('engineering', 0.1);
 					}
-					cashX(forceNeg(Math.trunc(_weatherRepairCost/4)), "weather");
+					cashX(forceNeg(Math.trunc(_weatherRepairCost / 4)), "weather");
 				} else {
 					r.push(`Since you lack the resources to effect prompt repairs yourself, prominent citizens step in to repair their own parts of the arcology. This is <span class="red">terrible for your reputation,</span> and it also <span class="red">severely reduces the arcology's prosperity.</span>`);
 					if (V.arcologies[0].prosperity > 50) {
-						V.arcologies[0].prosperity -= random(5,10), IncreasePCSkills('engineering', 0.1);
+						V.arcologies[0].prosperity -= random(5, 10), IncreasePCSkills('engineering', 0.1);
 					}
-					repX((Math.trunc(V.rep*0.9)) - V.rep, "weather");
-					r.push(`${V.IncreasePCSkills(}'engineering', 0.1)`);
-					cashX(forceNeg(Math.trunc(_weatherRepairCost/4)), "weather");
+					repX((Math.trunc(V.rep * 0.9)) - V.rep, "weather");
+					r.push(`${IncreasePCSkills('engineering', 0.1)}`);
+					cashX(forceNeg(Math.trunc(_weatherRepairCost / 4)), "weather");
 				}
-			} else if (V.weatherToday.severity-V.weatherCladding <= 2) {
+			} else if (V.weatherToday.severity - V.weatherCladding <= 2) {
 				if (V.weatherToday.severity > 2) {
 					V.weatherAwareness = 1;
 					r.push(`The arcology's hardened exterior resisted severe weather this week. Your citizens are <span class="green">grateful</span> to you for maintaining the arcology as a safe haven from the terrible climate.`);
@@ -978,16 +970,18 @@ App.EndWeek.personalBusiness = function() {
 			}
 		}
 	}
-	V.costs = Math.trunc(Math.abs(calculateCosts.bill()) * 100)/100;
-		r.push(` /*overwrite the prediction and actually pay the bill. GetCost should return a negative. Round to two decimal places.*/`);
+	V.costs = Math.trunc(Math.abs(calculateCosts.bill()) * 100) / 100;
+	/*overwrite the prediction and actually pay the bill. GetCost should return a negative. Round to two decimal places.*/
 	if (isNaN(V.costs)) {
-		<br><span class="red">Error, costs is NaN</span>
+		//<br>
+		r.push(`<span class="red">Error, costs is NaN</span>`);
 	}
 
 	/*Adding random changes to slave demand and supply*/
 	endWeekSlaveMarket();
 	if (V.menialDemandFactor <= -35000) {
-		<br>Demand for slaves is approaching a <span class="red">''historic low'',</span> forecasts predict
+		//<br>
+		r.push(`Demand for slaves is approaching a <span class="red">''historic low'',</span> forecasts predict`);
 		if (V.deltaDemand > 0) {
 			r.push(`the market will turn soon and <span class="green">''demand will rise''.</span>`);
 		} else if (V.deltaDemand < 0) {
@@ -996,7 +990,8 @@ App.EndWeek.personalBusiness = function() {
 			r.push(`the current demand will <span class="yellow">''stabilize''.</span>`);
 		}
 	} else if (V.menialDemandFactor <= -20000) {
-		<br>Demand for slaves is <span class="red">''very low'',</span> forecasts predict
+		//<br>
+		r.push(`Demand for slaves is <span class="red">''very low'',</span> forecasts predict`);
 		if (V.deltaDemand > 0) {
 			r.push(`the market will turn soon and <span class="green">''demand will rise''.</span>`);
 		} else if (V.deltaDemand < 0) {
@@ -1005,7 +1000,8 @@ App.EndWeek.personalBusiness = function() {
 			r.push(`the current demand will <span class="yellow">''stabilize''.</span>`);
 		}
 	} else if (V.menialDemandFactor >= 35000) {
-		<br>Demand for slaves is approaching a <span class="green">''historic high'',</span> forecasts predict
+		//<br>
+		r.push(`Demand for slaves is approaching a <span class="green">''historic high'',</span> forecasts predict`);
 		if (V.deltaDemand > 0) {
 			r.push(`<span class="green">''demand will continue to rise'',</span> but warn the peak is in sight.`);
 		} else if (V.deltaDemand < 0) {
@@ -1014,7 +1010,8 @@ App.EndWeek.personalBusiness = function() {
 			r.push(`the current demand will <span class="yellow">''stabilize''.</span>`);
 		}
 	} else if (V.menialDemandFactor >= 20000) {
-		<br>Demand for slaves is <span class="green">''very high'',</span> forecasts predict
+		//<br>
+		r.push(`Demand for slaves is <span class="green">''very high'',</span> forecasts predict`);
 		if (V.deltaDemand > 0) {
 			r.push(`<span class="green">''demand will continue to rise''.</span>`);
 		} else if (V.deltaDemand < 0) {
@@ -1023,7 +1020,8 @@ App.EndWeek.personalBusiness = function() {
 			r.push(`the current demand will <span class="yellow">''stabilize''.</span>`);
 		}
 	} else {
-		<br>Demand for slaves is <span class="yellow">''average'',</span> forecasts predict
+		//<br>
+		r.push(`Demand for slaves is <span class="yellow">''average'',</span> forecasts predict`);
 		if (V.deltaDemand > 0) {
 			r.push(`the market will see <span class="green">''rising demand''.</span>`);
 		} else if (V.deltaDemand < 0) {
@@ -1033,7 +1031,8 @@ App.EndWeek.personalBusiness = function() {
 		}
 	}
 	if (V.menialSupplyFactor <= -35000) {
-		<br>Supply of slaves is approaching a <span class="green">''historic low'',</span> forecasts predict
+		//<br>
+		r.push(`Supply of slaves is approaching a <span class="green">''historic low'',</span> forecasts predict`);
 		if (V.deltaSupply > 0) {
 			r.push(`the market will turn soon and <span class="red">''supply will rise''.</span>`);
 		} else if (V.deltaSupply < 0) {
@@ -1042,7 +1041,8 @@ App.EndWeek.personalBusiness = function() {
 			r.push(`the current supply will <span class="yellow">''stabilize''.</span>`);
 		}
 	} else if (V.menialSupplyFactor <= -20000) {
-		<br>Supply for slaves is <span class="green">''very low'',</span> forecasts predict
+		//<br>
+		r.push(`Supply for slaves is <span class="green">''very low'',</span> forecasts predict`);
 		if (V.deltaSupply > 0) {
 			r.push(`the market will turn soon and <span class="red">''supply will rise''.</span>`);
 		} else if (V.deltaSupply < 0) {
@@ -1051,7 +1051,8 @@ App.EndWeek.personalBusiness = function() {
 			r.push(`the current supply will <span class="yellow">''stabilize''.</span>`);
 		}
 	} else if (V.menialSupplyFactor >= 35000) {
-		<br>Supply for slaves is approaching a <span class="red">''historic high'',</span> forecasts predict
+		//<br>
+		r.push(`Supply for slaves is approaching a <span class="red">''historic high'',</span> forecasts predict`);
 		if (V.deltaSupply > 0) {
 			r.push(`<span class="red">''supply will continue to rise'',</span> but warn the peak is in sight.`);
 		} else if (V.deltaSupply < 0) {
@@ -1060,7 +1061,8 @@ App.EndWeek.personalBusiness = function() {
 			r.push(`the current supply will <span class="yellow">''stabilize''.</span>`);
 		}
 	} else if (V.menialSupplyFactor >= 20000) {
-		<br>Supply for slaves is <span class="red">''very high'',</span> forecasts predict
+		//<br>
+		r.push(`Supply for slaves is <span class="red">''very high'',</span> forecasts predict`);
 		if (V.deltaSupply > 0) {
 			r.push(`<span class="red">''supply will continue to rise''.</span>`);
 		} else if (V.deltaSupply < 0) {
@@ -1069,7 +1071,8 @@ App.EndWeek.personalBusiness = function() {
 			r.push(`the current supply will <span class="yellow">''stabilize''.</span>`);
 		}
 	} else {
-		<br>Supply for slaves is <span class="yellow">''average'',</span> forecasts predict
+		//<br>
+		r.push(`Supply for slaves is <span class="yellow">''average'',</span> forecasts predict`);
 		if (V.deltaSupply > 0) {
 			r.push(`the market will see <span class="red">''rising supply''.</span>`);
 		} else if (V.deltaSupply < 0) {
@@ -1082,19 +1085,23 @@ App.EndWeek.personalBusiness = function() {
 	/* Menial and regular slave markets are part of the same market, e.a. if (menial)slave supply goes up, all slave prices fall.
 	The RomanFS may need further tweaking (it probably got weaker). Could increase the slave supply cap if this FS is chosen to fix. */
 
-	V.slaveCostFactor = menialSlaveCost()/1000;
-	if (V.arcologies[0].FSRomanRevivalist > random(1,150)) {
+	V.slaveCostFactor = menialSlaveCost() / 1000;
+	if (V.arcologies[0].FSRomanRevivalist > random(1, 150)) {
 		if (V.slaveCostFactor > 0.8) {
-			<br><br><span class="yellow">Your Roman Revivalism is having an effect on the slave market and has driven local prices down</span> by convincing slave traders that this is a staunchly pro-slavery area.<br>
+			//<br><br>
+			r.push(`<span class="yellow">Your Roman Revivalism is having an effect on the slave market and has driven local prices down</span> by convincing slave traders that this is a staunchly pro-slavery area.`);
+			//<br>
 			V.menialSupplyFactor += 2000;
 		} else {
-			<br><br><span class="yellow">Your Roman Revivalism is having an effect on the slave market and is holding local prices down</span> by convincing slave traders that this is a staunchly pro-slavery area.<br>
+			//<br><br>
+			r.push(`<span class="yellow">Your Roman Revivalism is having an effect on the slave market and is holding local prices down</span> by convincing slave traders that this is a staunchly pro-slavery area.`);
+			//<br>
 		}
 	}
 
 	if (V.difficultySwitch === 1) {
 		if (V.econWeatherDamage > 0) {
-			_repairSeed = random(1,3);
+			const _repairSeed = random(1, 3);
 			if (V.disasterResponse === 0) {
 				if (_repairSeed === 3) {
 					V.econWeatherDamage -= 1;
@@ -1124,22 +1131,24 @@ App.EndWeek.personalBusiness = function() {
 			if (V.weatherToday.severity === 3) {
 				V.localEcon -= 1;
 				V.econWeatherDamage += 1;
-				<br><br>This week's terrible weather did a number on the region, <span class="red">hurting the local economy.</span> 
-	if (V.disasterResponse === 0) {//Investing in a disaster response unit will speed up recovery//
-	}
+				//<br><br>
+				r.push(`This week's terrible weather did a number on the region, <span class="red">hurting the local economy.</span> `);
+				if (V.disasterResponse === 0) {
+					r.push(App.UI.DOM.makeElement("span", `Investing in a disaster response unit will speed up recovery`, "note"));
+				}
 			} else if (V.weatherToday.severity > 3) {
 				V.localEcon -= 3;
 				V.econWeatherDamage += 3;
-				<br><br>This week's extreme weather ravaged the region, <span class="red">the local economy is seriously disrupted.</span> 
-	if (V.disasterResponse === 0) {//Investing in a disaster response unit will speed up recovery//
-	}
+				//<br><br>
+				r.push(`This week's extreme weather ravaged the region, <span class="red">the local economy is seriously disrupted.</span>`);
+				if (V.disasterResponse === 0) {
+					r.push(App.UI.DOM.makeElement("span", `Investing in a disaster response unit will speed up recovery`, "note"));
+				}
 			}
 		}
 	}
 
 	if (V.SF.Toggle && V.SF.Active >= 1) {
-		r.push(` `);
-	V.App.SF.AAR()
-		r.push(` `);
+		r.push(App.SF.AAR());
 	}
 };