diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw
index c3861b03b9c79443110fe1575127f763c1227c76..f5fa24d5800cd2e701a65b96de0c7897386dfa89 100644
--- a/src/uncategorized/SFMBarracks.tw
+++ b/src/uncategorized/SFMBarracks.tw
@@ -254,42 +254,59 @@
 			<</replace>><</link>> // Costs ¤_vehCost //<br>
 			<<elseif $securityForceVehiclePower == 5 || $securityForceVehiclePower == 7>>//The $securityForceName vehicle fleet is fully upgraded.//<<else>>//More barracks infrastructure upgrades are needed before the vehicle fleet can be expanded.//<</if>>
 		
-	<<if $securityForceArcologyUpgrades >=4 && $securityForceUpgradeToken == 0>>
-	<br><<link "Hangar">><<replace "#resultX">><span id="resultY">
-			<<if $securityForceAircraftPower < 5 && $securityForceArcologyUpgrades >= 4 && $securityForceUpgradeToken == 0>><br><<link "Ask The Colonel to improve the Airforce">><<replace "#resultY">>
-			"Sure, boss." she says, nodding. "Some new VTOLs would be great." She laughs. "They're the real multiplier over the scum out there. Not much a looter gang can do against air support." She picks up a tablet and taps a few commands on it. "I'll get right on it."
-						<<set $securityForceUpgradeToken = 1>>
-						<<set $securityForceAircraftPower += 1>>
-						<<set $cash -= 70000>>
-					<</replace>><</link>> // Costs ¤70000 //<br>
+	<<if $securityForceArcologyUpgrades >= 4 && $securityForceUpgradeToken == 0>>
+		<br><<link "Hangar">><<replace "#resultX">><span id="resultY">
+			<<if $securityForceAircraftPower < 5 && $securityForceArcologyUpgrades >= 4 && $securityForceUpgradeToken == 0>>
+				<br><<link "Ask The Colonel to improve the Airforce">>
+				<<replace "#resultY">>
+					"Sure, boss." she says, nodding. "Some new VTOLs would be great." She laughs. "They're the real multiplier over the scum out there. Not much a looter gang can do against air support." She picks up a tablet and taps a few commands on it. "I'll get right on it."
+					<<set $securityForceUpgradeToken = 1>>
+					<<set $securityForceAircraftPower += 1>>
+					<<set $cash -= 70000>>
+				<</replace>>
+				<</link>> // Costs ¤70000 //<br>
 			<<elseif $securityForceAircraftPower < 7 && $securityForceStimulantPower >= 5 && $securityForceArcologyUpgrades >= 5 && $securityForceVehiclePower >= 5 && $securityForceInfantryPower >= 5 && $securityForceDronePower >= 5>>
-					<<if $securityForceAircraftPower == 5>>
-						<<set _vehCost = 2750000>>
-					<<elseif $securityForceAircraftPower == 6>>
-						<<set _vehCost = 3250000>>
-					<<elseif $securityForceAircraftPower == 7>>
-						<<set _vehCost = 5750000>>	
-					<</if>>
-					<br><<link "Ask The Colonel to improve the Airforce">><<replace "#resultY">>"Sure, boss." she says, nodding. "Some new VTOLs would be great." She laughs. "They're the real multiplier over the scum out there. Not much a looter gang can do against air support." She picks up a tablet and taps a few commands on it. "I'll get right on it."
-						<<set $securityForceUpgradeToken = 1>>
-						<<set $securityForceAircraftPower += 1>>
-						<<set $cash -= _vehCost>>
-					<</replace>><</link>> // Costs ¤_vehCost //<br>
-				<<elseif $securityForceAircraftPower == 5 || $securityForceAircraftPower == 8>><br>//The $securityForceName air fleet is fully upgraded.//<<else>>//More barracks infrastructure upgrades are needed before the air fleet can be expanded.//<</if>>
+				<<if $securityForceAircraftPower == 5>>
+					<<set _vehCost = 2750000>>
+				<<elseif $securityForceAircraftPower == 6>>
+					<<set _vehCost = 3250000>>
+				<<elseif $securityForceAircraftPower == 7>>
+					<<set _vehCost = 5750000>>	
+				<</if>>
+				<br><<link "Ask The Colonel to improve the Airforce">>
+				<<replace "#resultY">>
+					"Sure, boss." she says, nodding. "Some new VTOLs would be great." She laughs. "They're the real multiplier over the scum out there. Not much a looter gang can do against air support." She picks up a tablet and taps a few commands on it. "I'll get right on it."
+					<<set $securityForceUpgradeToken = 1>>
+					<<set $securityForceAircraftPower += 1>>
+					<<set $cash -= _vehCost>>
+				<</replace>>
+				<</link>> // Costs ¤_vehCost //<br>
+			<<elseif $securityForceAircraftPower == 5 || $securityForceAircraftPower == 8>>
+				<br>//The $securityForceName air fleet is fully upgraded.//
+			<<else>>
+				//More barracks infrastructure upgrades are needed before the air fleet can be expanded.//
+			<</if>>
 			
 			<<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && $securityForceStimulantPower >= 5 && $securityForceArcologyUpgrades >= 5 && $securityForceVehiclePower >= 5 && $securityForceDronePower >= 5 && $securityForceInfantryPower >= 5 && $securityForceSpacePlanePower < 1>>
-					<br><<link "Ask The Colonel to 'borrow' a SpacePlane">><<replace "#resultY">>"Sure, boss." she says, nodding. "A orbital plane should help a lot." She laughs. "The scum out there don't seem to like it when we have eyes they can't hit." She picks up a tablet and taps a few commands on it. "I'll get right on it."
+				<br><<link "Ask The Colonel to 'borrow' a SpacePlane">>
+					<<replace "#resultY">>
+					"Sure, boss." she says, nodding. "A orbital plane should help a lot." She laughs. "The scum out there don't seem to like it when we have eyes they can't hit." She picks up a tablet and taps a few commands on it. "I'll get right on it."
 					<<set $securityForceUpgradeToken = 1>>
 					<<set $securityForceSpacePlanePower += 1>>
 					<<set $cash -= 4750000>>
-				<</replace>><</link>> // Costs ¤4750000 //<br><</if>>
+					<</replace>>
+				<</link>> // Costs ¤4750000 //<br>
 			<<elseif $securityForceSpacePlanePower >= 1 && $securityForceSpacePlanePower < 9 && $securityForceUpgradeToken == 0>>
-					<br><<link "Ask The Colonel to upgrade the SpacePlane">><<replace "#resultY">>"Sure, boss." she says, nodding. "Upgrading the orbital plane should help a lot." She laughs. "The scum out there don't seem to like it when we have eyes they can't hit." She picks up a tablet and taps a few commands on it. "I'll get right on it."
-						<<set $securityForceUpgradeToken = 1>>
-						<<set $securityForceSpacePlanePower += 1>>
-						<<set $cash -= 3750000>>
-					<</replace>><</link>> // Costs ¤3750000 //<br>
-			<<elseif $securityForceSpacePlanePower == 9>>//The $securityForceName's SpacePlane is fully upgraded.//<</if>>
+				<br><<link "Ask The Colonel to upgrade the SpacePlane">>
+					<<replace "#resultY">>"Sure, boss." she says, nodding. "Upgrading the orbital plane should help a lot." She laughs. "The scum out there don't seem to like it when we have eyes they can't hit." She picks up a tablet and taps a few commands on it. "I'll get right on it."
+					<<set $securityForceUpgradeToken = 1>>
+					<<set $securityForceSpacePlanePower += 1>>
+					<<set $cash -= 3750000>>
+					<</replace>>
+				<</link>> // Costs ¤3750000 //<br>
+			<<elseif $securityForceSpacePlanePower == 9>>
+				//The $securityForceName's SpacePlane is fully upgraded.//
+			<</if>>
 		
 			<<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && $securityForceStimulantPower >= 5 && $securityForceArcologyUpgrades >= 5 && $securityForceVehiclePower >= 5 && $securityForceDronePower >= 5 && $securityForceInfantryPower >= 5 && $securityForceFortressZeppelin < 1>>
 					<br><<link "Ask The Colonel to 'borrow' a Fortress Zeppelin">><<replace "#resultY">>"Sure, boss." she says, nodding. "A Fortress Zeppelin would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
@@ -303,7 +320,7 @@
 						<<set $securityForceUpgradeToken = 1>>
 						<<set $securityForceFortressZeppelin += 1>>
 						<<set $cash -= 20000000>>
-					<</replace>><</link>> // Costs ¤20000000 //<br><</if>>
+					<</replace>><</link>> // Costs ¤20000000 //<br>
 			<</if>>
 
 			<<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && $securityForceStimulantPower >= 5 && $securityForceArcologyUpgrades >= 5 && $securityForceVehiclePower >= 5 && $securityForceDronePower >= 5 && $securityForceInfantryPower >= 5 && $securityForceAC130 < 1>>