diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw
index 0b02f22d391f6675143e0fdb9582285140192a29..004bf182a490882d6be21705e4e808dcf34c19ec 100644
--- a/src/uncategorized/SFMBarracks.tw
+++ b/src/uncategorized/SFMBarracks.tw
@@ -8,7 +8,7 @@
 
 <<set _N1 = 2>>
 <<set _N2 = 2>>
-<<set _N3 = 2>> 
+<<set _N3 = 2>>
 <<set _Name = "<<if $CurrentTradeShowAttendance == 1>>Lieutenant Colonel <<SlaveFullName $LieutenantColonel>><<else>>The Colonel<</if>>">>
 
 <<if $economy == .5>>
@@ -85,7 +85,7 @@ securityForceX */
 	<<set _SFNO = _Barracks+_Armoury+_StimulantLab+_Garage+_Hangar+_DroneBay+_LaunchBayNO>>
 	<<set _max = _BarracksMax+_ArmouryMax+_StimulantLabMax+_GarageMax+_HangarMax+_DroneBayMax+_LaunchBayNOMax>>
 	<<set _SFO = 0>>
-	<<set _NavalYard = 0>> 
+	<<set _NavalYard = 0>>
 	<<set _NavalYardMax = 0>>
 <</if>>
 <<if $terrain == "oceanic" || $terrain == "marine">>
@@ -97,7 +97,7 @@ securityForceX */
 <</if>>
 
 <<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Barracks">>
-
+[[Test Event|securityForceTradeShow]]
 //The barracks of <<textbox "$securityForceName" $securityForceName "SFM Barracks">> is located in the lower levels of $arcologies[0].name, occupying unneeded warehouse space. It is not accessible to the general citizenry, but your personal elevator has express service to it. As you step off, two soldiers in combat armour manning the entry checkpoint tense and raise their weapons, before nodding respectfully and stepping aside, allowing their patron entry. The barracks is cavernous, containing areas for the soldiers to sleep and keep their belongings, areas for the storage and maintenance of their weapons and equipment, and common areas for them to amuse themselves, since they rarely mix with your citizens on the upper levels. You survey the facilities.//
 
 <br><br>
@@ -144,7 +144,7 @@ securityForceX */
 	The barracks has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, tri barreled electromagnetic railgun artillery 160 inch pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
 	<br>After pooling resources between several departmental R&D teams, $securityForceName now has a faster and much more efficient custom network.<br>Added VR support to the kill house.
 <</if>>
-		
+
 <br><br>
 
 <div style="margin-left:1em">
@@ -165,7 +165,7 @@ securityForceX */
 
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ''Armory:''
 <br>
-/* 11 upgrades */ 
+/* 11 upgrades */
 <<if $securityForceInfantryPower == 0>>
 	The armory is well-stocked with high-quality personal weapons and light armour, but contains little in the way of exceptional armament.
 <<elseif $securityForceInfantryPower == 1>>
@@ -301,7 +301,7 @@ securityForceX */
 		Upgraded the space plane's shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the space plane's tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the space plane's engines to allow for more efficient fuel.Reduced the space plane's weight and reworked the body to reduce drag.Increased the crew comfort and life support systems to increase operational time.Added an additional engine per wing which greatly increases acceleration and raises the top speed to mach 15, making $securityForceName Space Plane untouchable.Replaced the skin of $securityForceName Space Plane with a basic optical illusion kit.
 	<<elseif $securityForceSpacePlanePower == 11>>
 		Upgraded the space plane's shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the space plane's tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the space plane's engines to allow for more efficient fuel.Reduced the space plane's weight and reworked the body to reduce drag.Increased the crew comfort and life support systems to increase operational time.Added an additional engine per wing which greatly increases acceleration and raises the top speed to mach 15, making $securityForceName Space Plane untouchable.Replaced the skin of $securityForceName Space Plane with an advanced optical illusion kit.
-	<</if>> 
+	<</if>>
 <</if>>
 <<if $securityForceFortressZeppelin > 0>>
 	<br>
@@ -341,7 +341,7 @@ securityForceX */
 <</if>>
 <</if>>
 <</if>>
-	
+
 <<if $securityForceArcologyUpgrades >= 2>>
 <br><br>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ''Drone Bay:''
@@ -375,7 +375,7 @@ securityForceX */
 	<<elseif $securityForceSatalitePower == 2>>
 		Modernized the satalite's electronics.
 	<<elseif $securityForceSatalitePower == 3>>
-		Modernized the satalite's electronics, wiring and circuitry. 
+		Modernized the satalite's electronics, wiring and circuitry.
 	<<elseif $securityForceSatalitePower == 4>>
 		Modernized the satalite's electronics, wiring and circuitry.Installed a basic localized communications jammer to the satalite (excludes your own frequencies with little to no leeway) that will "slightly" anger locals until it is deactivated.
 	<<elseif $securityForceSatalitePower == 5>>
@@ -429,7 +429,7 @@ securityForceX */
 		Upgraded the giant robot's wiring, circuitry, power efficiency,battery capacity,armour,weapons to include heat seeking missiles plus a massive long sword in addition to quad 140 inch back mounted electromagnetic cannons and the amount of pilot's to two via a synced neural link.Improved the life support systems, allowing for longer operational time.
 	<<elseif $securityForceGiantRobot == 10>>
 		Upgraded the giant robot's wiring, circuitry, power efficiency,battery capacity,armour,weapons to include heat seeking missiles plus a massive long sword in addition to quad 140 inch back mounted electromagnetic cannons and the amount of pilot's to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit.
-	<</if>> 
+	<</if>>
 <</if>>
 <<if $securityForceMissileSilo > 0>>
 	<br>
@@ -462,7 +462,7 @@ securityForceX */
 <</if>>
 <<if $securityForceSubmarine > 0>>
 	<br>
-	/* 5 upgrades */ 
+	/* 5 upgrades */
 	<<if $securityForceSubmarine == 1>>
 	A basic submarine has been 'borrowed' from the old world.
 	<<elseif $securityForceSubmarine == 2>>
@@ -477,8 +477,8 @@ securityForceX */
 <</if>>
 <<if $securityForceHeavyAmphibiousTransport > 0>>
 	<br>
-	/* 3 upgrades */ 
-	<<if $securityForceHeavyAmphibiousTransport == 1>> 
+	/* 3 upgrades */
+	<<if $securityForceHeavyAmphibiousTransport == 1>>
 		A basic heavy amphibious transport has been 'borrowed' from the old world.
 	<<elseif $securityForceHeavyAmphibiousTransport == 2>>
 		Modernized the heavy amphibious transport's armor.
@@ -553,7 +553,7 @@ securityForceX */
 	The amenities are staffed by menial slaves, captured by the soldiers on their excursions.
 <</if>>
 </div>
-	
+
 <br>
 
 //In the middle of the common area is a pile of supply crates with a pavilion on top - The Colonel's personal throne and open quarters, the result of her preferring to live an extreme lifestyle amongst her soldiers rather than in her empty quarters on the upper levels. It's draped with the 'flag' of $securityForceName, one of her inventions. Sprawled all around it is an immense quantity of; alcohol, hard drugs,clothes, electronic devices, huge amounts of cash, jewels and precious metals looted from the outside world.//
@@ -633,7 +633,7 @@ securityForceX */
 <<if _SFNO >= _max || _SFO >= _max>>
 //$securityForceName is fully equipped and upgraded - nothing else can be done.//
 <</if>>
-	
+
 <<if $securityForceGiftToken == 1>>
 	//_Name has already provided you with extra tribute this week.//
 <</if>>
@@ -656,7 +656,7 @@ securityForceX */
 	<br><br>So far, you have currently discussed increasing the frequency of upgrading $securityForceName per week _Name <<if $securityForceUpgradeTokenReset == 1>>once<<else>>$securityForceUpgradeTokenReset times<</if>>.
 <</if>>
 
-<<if $securityForceUpgradeToken == 0 && _SFNO < _max || _SFO < _max>>
+<<if (_SFNO < _max || _SFO < _max) && $securityForceUpgradeToken == 0>>
 <span id="resultX">
 	<br><br>Which facility or equipment do you wish _Name to upgrade this week?
 
@@ -715,7 +715,7 @@ securityForceX */
 		<<if _Barracks == 5 || _Barracks == 16>>
 			<br>//$securityForceName has fully upgraded the barracks to support it's activities//
 		<</if>>
-		
+
 		/*
 		<<if $securityForceUpgradeToken == 0 && _Barracks >= 1 && $FacilitySupport == 0>>
 			<br><<link "Facility Support">>
@@ -726,7 +726,7 @@ securityForceX */
 			<</link>> // Costs ¤<<print 150000000*_Env*(_SFNO/100 || _SFO/100)>> //
 		<</if>>
 		*/
-				
+
 		<<if $securityForceUpgradeToken == 0 && _Armoury < 5>>
 			<br><<link "Armoury">>
 				<<replace "#resultX">><br><br>
@@ -745,7 +745,7 @@ securityForceX */
 		<<if _Armoury == 5 || _Armoury == 11>>
 			<br>//$securityForceName has fully upgraded the armoury to support it's activities.//
 		<</if>>
-		
+
 			<<if $securityForceUpgradeToken == 0 && _StimulantLab < 5>>
 			<br><<link "Stimulant Lab">>
 				<<replace "#resultX">><br><br>
@@ -778,7 +778,7 @@ securityForceX */
 		<<if _StimulantLab == 5 || _StimulantLab == 9>>
 			<br>//$securityForceName has fully upgraded the stimulant lab to support it's activities.//
 		<</if>>
-				
+
 		<<if $securityForceUpgradeToken == 0 && _Barracks >= 1 && _Garage < _GarageMax>>
 		<br><<link "Garage">>
 		<<replace "#resultX">>
@@ -786,8 +786,8 @@ securityForceX */
 		<br><br>"Which unit do you wish to upgrade or 'borrow'?"
 		<<link "Go back">>
 			<<goto "SFM Barracks">>
-		<</link>>	
-		
+		<</link>>
+
 			<<if $securityForceUpgradeToken == 0 && $securityForceVehiclePower < 5>>
 				<br><<link "Light and medium vehicles">>
 					<<replace "#resultB">><br><br>
@@ -813,7 +813,7 @@ securityForceX */
 			<<else>>
 				<br>//More barracks infrastructure upgrades are needed before the vehicle fleet can be expanded.//
 			<</if>>
-			
+
 			<<if $securityForceUpgradeToken == 0 && $securityForceHeavyBattleTank < 1 && $securityForceVehiclePower >= 7>>
 					<br><<link "A heavy battle tank">>
 					<<replace "#resultB">><br><br>
@@ -837,13 +837,13 @@ securityForceX */
 			<<if $securityForceHeavyBattleTank == 3>>
 				<br>//$securityForceName has fully upgraded the heavy battle tank to support it's activities.//
 			<</if>>
-			
+
 		</span>
 		<</replace>>
 		<</link>>
 		<</if>>
 		<<if _Garage >= _GarageMax>>//<br>$securityForceName has fully upgraded the garage to support it's activities.//<</if>>
-			
+
 		<<if $securityForceUpgradeToken == 0 && _Barracks >= 4 && _Hangar < _HangarMax>>
 		<br><<link "Hangar">>
 		<<replace "#resultX">>
@@ -852,7 +852,7 @@ securityForceX */
 		<<link "Go back">>
 			<<goto "SFM Barracks">>
 		<</link>>
-			
+
 			<<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower < 5>>
 				<br><<link "Light and medium aircraft">>
 					<<replace "#resultY">><br><br>
@@ -866,7 +866,7 @@ securityForceX */
 				<<elseif $securityForceAircraftPower == 6>>
 					<<set _airCost = 3250000>>
 				<<elseif $securityForceAircraftPower == 7>>
-					<<set _airCost = 5750000>>	
+					<<set _airCost = 5750000>>
 				<</if>>
 				<br><<link "Light and medium aircraft">>
 					<<replace "#resultY">><br><br>
@@ -880,7 +880,7 @@ securityForceX */
 			<<else>>
 				<br>//More barracks infrastructure upgrades are needed before the air fleet can be expanded.//
 			<</if>>
-					
+
 			<<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceSpacePlanePower < 1>>
 				<br><<link "A space plane">>
 					<<replace "#resultY">><br><br>
@@ -916,7 +916,7 @@ securityForceX */
 			<<if $securityForceSpacePlanePower == 11>>
 				<br>//$securityForceName has fully upgraded the space plane to support it's activities.//
 			<</if>>
-					
+
 			<<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceFortressZeppelin < 1>>
 				<br><<link "A fortress zeppelin">>
 					<<replace "#resultY">><br><br>
@@ -953,7 +953,7 @@ securityForceX */
 			<<if $securityForceAC130 == 5>>
 				<br>//$securityForceName has fully upgraded the AC-130 to support it's activities.//
 			<</if>>
-			
+
 			<<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceHeavyTransport < 1>>
 				<br><<link "A heavy transport">>
 					<<replace "#resultY">><br><br>
@@ -971,13 +971,13 @@ securityForceX */
 			<<if $securityForceHeavyTransport == 3>>
 				<br>//$securityForceName has fully upgraded the heavy transport to support it's activities.//
 			<</if>>
-		
+
 		</span>
 		<</replace>>
 		<</link>>
 		<</if>>
 		<<if _Hangar >= _HangarMax>>//<br>$securityForceName has fully upgraded the hangar to support it's activities.//<</if>>
-		
+
 		<<if $securityForceUpgradeToken == 0 && _DroneBay < 5 && _Barracks >= 2>>
 			<br><<link "Drone bay">>
 				<<replace "#resultX">>
@@ -1008,7 +1008,7 @@ securityForceX */
 			<<link "Go back">>
 				<<goto "SFM Barracks">>
 			<</link>>
-				
+
 				<<if $securityForceUpgradeToken == 0 && _Barracks >= 4 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceSatalitePower < 1>>
 					<br><<link "A satalite">>
 						<<replace "#resultZ">><br><br>
@@ -1042,7 +1042,7 @@ securityForceX */
 				<<if $securityForceSatalitePower == 17>>
 					<br>//$securityForceName has fully upgraded the satalite to support it's activities.//
 				<</if>>
-						
+
 			<<if $securityForceUpgradeToken == 0 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceGiantRobot < 1 && $terrain != "oceanic">>
 					<br><<link "A giant robot">>
 						<<replace "#resultZ">><br><br>
@@ -1078,7 +1078,7 @@ securityForceX */
 				<<if $securityForceGiantRobot == 10>>
 					<br>//$securityForceName has fully upgraded the giant robot to support it's activities.//
 				<</if>>
-				
+
 			<<if $securityForceUpgradeToken == 0 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceMissileSilo < 1 && $terrain != "oceanic">>
 					<br><<link "A missile silo">>
 						<<replace "#resultZ">><br><br>
@@ -1100,7 +1100,7 @@ securityForceX */
 					<</link>> // Costs ¤<<print _msCost*_Env>> //
 			<</if>>
 				<<if $securityForceMissileSilo == 3>><br>//$securityForceName has fully upgraded the missile silo to support it's activities.//<</if>>
-				
+
 			</span>
 			<</replace>>
 			<</link>>
@@ -1116,7 +1116,7 @@ securityForceX */
 				<<link "Go back">>
 					<<goto "SFM Barracks">>
 				<</link>>
-			
+
 				<<if $securityForceUpgradeToken == 0 && $securityForceAircraftCarrier < 1>>
 					<br><<link "An aircraft carrier">>
 						<<replace "#resultA">><br><br>
@@ -1135,7 +1135,7 @@ securityForceX */
 				<<if $securityForceAircraftCarrier == 4>>
 					<br>//$securityForceName has fully upgraded the aircraft carrier to support it's activities.//
 				<</if>>
-					
+
 				<<if $securityForceUpgradeToken == 0 && $securityForceSubmarine < 1>>
 					<br><<link "A submarine">>
 						<<replace "#resultA">><br><br>
@@ -1157,7 +1157,7 @@ securityForceX */
 					<</link>> // Costs ¤<<print _subCost*_Env>> //
 				<</if>>
 				<<if $securityForceSubmarine == 5>><br>//$securityForceName has fully upgraded the submarine to support it's activities.//<</if>>
-				
+
 				<<if $securityForceUpgradeToken == 0 && $securityForceHeavyAmphibiousTransport < 1>>
 					<br><<link "A heavy amphibious transport">>
 						<<replace "#resultA">><br><br>
@@ -1179,20 +1179,20 @@ securityForceX */
 					<</link>> // Costs ¤<<print _hatCost*_Env>> //
 				<</if>>
 				<<if $securityForceHeavyAmphibiousTransport == 3>><br>//$securityForceName has fully upgraded the heavy amphibious transport to support it's activities.//<</if>>
-				
+
 			</span>
 			<</replace>>
 			<</link>>
 		<</if>>
 		<<if $terrain == "oceanic" || $terrain == "marine" && (_NavalYard >= _NavalYardMax)>><br>$securityForceName has fully upgraded the naval yard to support it's activities.//<</if>>
-	
+
 </span>
 <</if>>
 
 <<nobr>>
 <<if $securityForceColonelToken == 0 && $securityForceSexedColonelToken == 0 && $CurrentTradeShowAttendance == 0>>
 	<br><br>
-	<span id="result3">	
+	<span id="result3">
 	Where do you want to spend time with The Colonel this week?
 		<br>
 		<<link "Up on the surface, along with an escort of course.">>
@@ -1250,7 +1250,7 @@ securityForceX */
 					Your total lack of medical skill causes the death of the citizen.
 					<<set $arcologies[0].prosperity -= .25>>
 				<<elseif $PC.medicine >= 100 && $career == "medicine">>
-					Your expertness of medicine ensures that the citizen is probably the best they have ever been. They are so grateful that they are more than happy to try and compensate your time. Word quickly spreads of the kindly medically trained archology owner who took the time to heal a citizen, providing confidence to the rest of the citizens. 
+					Your expertness of medicine ensures that the citizen is probably the best they have ever been. They are so grateful that they are more than happy to try and compensate your time. Word quickly spreads of the kindly medically trained archology owner who took the time to heal a citizen, providing confidence to the rest of the citizens.
 					<<if $economy == 0.5>>
 						<<set $rep += 10, $cash += 100>>
 					<<elseif $economy == 1>>
@@ -1259,7 +1259,7 @@ securityForceX */
 						<<set $rep += 10, $cash += 200>>
 					<</if>>
 				<<elseif $PC.medicine >= 100>>
-					Your expertness of medicine ensures that the citizen is probably the best they have ever been. Word quickly spreads of the kindly archology owner who took the time to heal a citizen. 
+					Your expertness of medicine ensures that the citizen is probably the best they have ever been. Word quickly spreads of the kindly archology owner who took the time to heal a citizen.
 					<<set $rep += 5>>
 				<<elseif $PC.medicine >= 60>>
 					Your mastery of medicine ensures that the citizen's condition is noticeably better.
@@ -1279,7 +1279,7 @@ securityForceX */
 					<<set $choice = 3>>
 					<<replace "#result10">>
 							<<set $securityForceColonelToken = 1>>
-							"Sure, boss." she says, nodding. "I can use a break from all of this." She laughs. 
+							"Sure, boss." she says, nodding. "I can use a break from all of this." She laughs.
 							She can try teaching you a bit about;
 							<span id="result4">
 								<<link "field medicine">>
@@ -1345,7 +1345,7 @@ securityForceX */
 										<<elseif $PC.engineering >= 100>>
 										//Time to for you to out there and building something.
 										<<elseif $PC.engineering >= 60>>
-										//Feel free to 'nail' me any time. 
+										//Feel free to 'nail' me any time.
 										<<elseif $PC.engineering >= 30>>
 										//Yes that is the correct hammering position.
 										<<elseif $PC.engineering >= 10>>
@@ -1383,12 +1383,12 @@ securityForceX */
 								<</link>>
 							</span>
 						<</replace>>
-					<</link>>	
-			
+					<</link>>
+
 					<br><<link "Have some fun">>
 					<<set $choice = 3>>
 					<<replace "#result10">>
-							<<set $securityForceSexedColonel = 1, $securityForceColonelToken = 1>>	
+							<<set $securityForceSexedColonel = 1, $securityForceColonelToken = 1>>
 							<span id="result11">
 							Where should this fun take place?
 								<br><<link "In private">>
@@ -1546,7 +1546,7 @@ securityForceX */
 														Inset sex noises here.
 													<</if>>
 												<</replace>>
-											<</link>>	
+											<</link>>
 											<br>
 											<<link "Ass">>
 												<<replace "#result6">>
@@ -1618,7 +1618,7 @@ securityForceX */
 														Inset sex noises here.
 													<</if>>
 												<</replace>>
-											<</link>>	
+											<</link>>
 											<br>
 											<<link "All three holes">>
 												<<replace "#result6">>
@@ -1645,7 +1645,7 @@ securityForceX */
 											<</link>>
 										</span>
 									<</replace>>
-								<</link>>	
+								<</link>>
 							</span>
 					<</replace>>
 					<</link>>