diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw
index ea81e4e39a18b697350051755f2ff37cdec9dba5..e1e0de021529453f4c065ca1fff51bb2b61a766d 100644
--- a/src/uncategorized/SFMBarracks.tw
+++ b/src/uncategorized/SFMBarracks.tw
@@ -64,7 +64,7 @@ securityForceX */
 <<set _Armoury = $securityForceInfantryPower>>
 <<set _ArmouryMax = 11>>
 
-<<set _StimulantLab = $securityForceVehiclePower>>
+<<set _StimulantLab = $securityForceStimulantPower>>
 <<set _StimulantLabMax = 9>>
 
 <<set _Garage = $securityForceVehiclePower+$securityForceHeavyBattleTank>>
@@ -777,7 +777,7 @@ securityForceX */
 			<</link>> // Costs ¤<<print _drugCost*_Env>> //
 		<</if>>
 		<<if _StimulantLab == 5 || _StimulantLab == 9>>
-			//$securityForceName has fully upgraded the stimulant lab to support it's activities.//
+			<br>//$securityForceName has fully upgraded the stimulant lab to support it's activities.//
 		<</if>>
 				
 		<<if _Barracks >= 1 && _Garage < _GarageMax>>
@@ -812,7 +812,7 @@ securityForceX */
 				<</link>> // Costs ¤<<print _vehCost*_Env>> //
 			<</if>>
 			<<if $securityForceVehiclePower == 5 || $securityForceVehiclePower == 7>>
-				//$securityForceName has fully upgraded the vehicle fleet to support it's activities.//
+				<br>//$securityForceName has fully upgraded the vehicle fleet to support it's activities.//
 			<<else>>
 				//More barracks infrastructure upgrades are needed before the vehicle fleet can be expanded.//
 			<</if>>
@@ -988,14 +988,14 @@ securityForceX */
 			<br><<link "Drone bay">>
 				<<replace "#resultX">>
 				"Sure, boss." she says, nodding. "Some new drones would be nice." She laughs. "The poor bastards out there shit themselves when they see combat drones fly over the horizon." She picks up a tablet and taps a few commands on it. "I'll get right on it."
-				<<set $securityForceUpgradeToken = 1, _DroneBay++, $cash -= 45000*_Env>>
+				<<set $securityForceUpgradeToken = 1, $securityForceDronePower++, $cash -= 45000*_Env>>
 				<</replace>>
 			<</link>> // Costs ¤<<print 45000*_Env>> //
 		<<elseif _DroneBay < 6 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _Armoury >= 5>>
 			<br><<link "Drone bay">>
 				<<replace "#resultX">>
 				"Sure, boss." she says, nodding. "Some new drones would be nice." She laughs. "The poor bastards out there shit themselves when they see combat drones fly over the horizon." She picks up a tablet and taps a few commands on it. "I'll get right on it."
-				<<set $securityForceUpgradeToken = 1, _DroneBay++, $cash -= 2000000*_Env>>
+				<<set $securityForceUpgradeToken = 1, $securityForceDronePower++, $cash -= 2000000*_Env>>
 				<</replace>>
 			<</link>> // Costs ¤<<print  2000000*_Env>> //
 		<</if>>
diff --git a/src/uncategorized/securityForceEOWReport.tw b/src/uncategorized/securityForceEOWReport.tw
index 8b8abd5f033089eaae7435a6a56af20aa331bd82..cde870c7eababffc1c32069b2bae9f5874fa7bb4 100644
--- a/src/uncategorized/securityForceEOWReport.tw
+++ b/src/uncategorized/securityForceEOWReport.tw
@@ -41,9 +41,9 @@ securityForceX
 */
 <<set _Barracks = $securityForceArcologyUpgrades>>
 <<set _Armoury = $securityForceInfantryPower>>
-<<set _StimulantLab = $securityForceInfantryPower>>
+<<set _StimulantLab = $securityForceStimulantPower>>
 <<set _Garage = $securityForceVehiclePower+$securityForceHeavyBattleTank>>
-<<set _Hangar = $securityForceAircraftPower+$securityForceSpacePlanePower+$securityForceFortressZeppelin+$securityForceAC130>>
+<<set _Hangar = $securityForceAircraftPower+$securityForceSpacePlanePower+$securityForceFortressZeppelin+$securityForceAC130+$securityForceHeavyTransport>>
 <<set _DroneBay = $securityForceDronePower>>
 <<set _LaunchBayNO = $securityForceSatalitePower+$securityForceGiantRobot+$securityForceMissileSilo>>
 <<set _LaunchBayO = $securityForceSatalitePower>>
@@ -150,7 +150,7 @@ securityForceX
 			<<set $securityForceRecruit += ($securityForceGiantRobot)>> <</if>>
 	<</if>>
 	
-	<<if $terrain == "oceanic"
+	<<if $terrain == "oceanic" || $terrain == "marine">>
 		<<if $securityForceAircraftCarrier > 0>>
 			<<set $securityForceRecruit += ($securityForceAircraftCarrier)>> <</if>>
 		<<if $securityForceSubmarine > 0>>