diff --git a/src/Mods/SpecialForce/SpecialForce.js b/src/Mods/SpecialForce/SpecialForce.js
index d2cc717111f066aaa83f8768ed98459b1d3703cd..5e4d0271f4b3677494625b32664615e9f25ebc45 100644
--- a/src/Mods/SpecialForce/SpecialForce.js
+++ b/src/Mods/SpecialForce/SpecialForce.js
@@ -41,40 +41,20 @@ App.SF.unlocked = (function() {
 		+ (V.terrain !== "oceanic" ? V.SF.Squad.AV + V.SF.Squad.TV : 0) + V.SF.Squad.AA + V.SF.Squad.TA >= 30;
 	}
 
-	function garage(mode = 'standard') {
-		if (V.SF.Squad.Firebase >= 1 && V.terrain !== "oceanic") {
-			if (V.SF.Squad.AV + V.SF.Squad.TV + V.SF.Squad.PGT >= 0 || mode === 'cheat') {
-				return true;
-			}
-		}
-		return false;
+	function garage() {
+		return (V.SF.Squad.Firebase >= 1 && V.terrain !== "oceanic") ? true : false;
 	}
 
-	function hangar(mode = 'standard') {
-		if (V.SF.Squad.Firebase >= 4) {
-			if (V.SF.Squad.AA + V.SF.Squad.TA + V.SF.Squad.SpacePlane + V.SF.Squad.GunS >= 0 || mode === 'cheat') {
-				return true;
-			}
-		}
-		return false;
+	function hangar() {
+		return V.SF.Squad.Firebase >= 4 ? true : false;
 	}
 
-	function launchBay(mode = 'standard') {
-		if (secondTier()) {
-			if (V.SF.Squad.Satellite + V.SF.Squad.GiantRobot + V.SF.Squad.MissileSilo >= 0 || mode === 'cheat') {
-				return true;
-			}
-		}
-		return false;
+	function launchBay() {
+		return secondTier() ? true : false;
 	}
 
-	function navalYard(mode = 'standard') {
-		if (secondTier() && (V.terrain === "oceanic" || V.terrain === "marine")) {
-			if (V.SF.Squad.AircraftCarrier + V.SF.Squad.Sub + V.SF.Squad.HAT >= 0 || mode === 'cheat') {
-				return true;
-			}
-		}
-		return false;
+	function navalYard() {
+		return (secondTier() && (V.terrain === "oceanic" || V.terrain === "marine")) ? true : false;
 	}
 })();
 
@@ -87,10 +67,7 @@ App.SF.upgrades = (function() {
 	};
 
 	function total() {
-		if (V.SF.Toggle === 0 || V.SF.Active < 1) {
-			return 0;
-		}
-		return Object.values(V.SF.Squad).reduce((a, b) => a+b);
+		return V.SF.Toggle === 1 && V.SF.Active >= 1 ? Object.values(V.SF.Squad).reduce((a, b) => a + b) : 0;
 	}
 
 	function list(completeView = '') {
diff --git a/src/Mods/SpecialForce/editSF.tw b/src/Mods/SpecialForce/editSF.tw
index b0797d7bbfa8f1046d9b382c2fa209f18afbb000..6f60ba36bb811aa605e6b9504dacd244bc4421e7 100644
--- a/src/Mods/SpecialForce/editSF.tw
+++ b/src/Mods/SpecialForce/editSF.tw
@@ -21,7 +21,7 @@ __Upgrades__: _size/_max(<<= (_size/_max).toFixed(2)>>%)
 	<<run _options.addOption("''Drones: '' (current max <<= App.SF.upgrades.currentUnitMax('Drones')>>)", "Drones", V.SF.Squad).showTextBox()>>
 <</if>>
 
-<<if App.SF.unlocked.garage('cheat')>>
+<<if App.SF.unlocked.garage()>>
 	<<run _options.addOption("''Garage:''<br>&nbsp;&nbsp;''Attack Vehicles: '' (current max <<= App.SF.upgrades.currentUnitMax('AV')>>)", "AV", V.SF.Squad).showTextBox()>>
 	<<run _options.addOption("&nbsp;&nbsp;''Transport Vehicles: '' (current max <<= App.SF.upgrades.currentUnitMax('TV')>>)", "TV", V.SF.Squad).showTextBox()>>
 	<<if _T1>>
@@ -29,7 +29,7 @@ __Upgrades__: _size/_max(<<= (_size/_max).toFixed(2)>>%)
 	<</if>>
 <</if>>
 
-<<if App.SF.unlocked.hangar('cheat')>>
+<<if App.SF.unlocked.hangar()>>
 	<<run _options.addOption("''Hangar:''<br>&nbsp;&nbsp;''Attack Planes: '' (current max <<= App.SF.upgrades.currentUnitMax('AA')>>)", "AA", V.SF.Squad).showTextBox()>>
 	<<run _options.addOption("&nbsp;&nbsp;''Transport Planes: '' (current max <<= App.SF.upgrades.currentUnitMax('TA')>>)", "TA", V.SF.Squad).showTextBox()>>
 	<<if _T1>>
@@ -38,7 +38,7 @@ __Upgrades__: _size/_max(<<= (_size/_max).toFixed(2)>>%)
 	<</if>>
 <</if>>
 
-<<if App.SF.unlocked.launchBay('cheat')>>
+<<if App.SF.unlocked.launchBay()>>
 	<<run _options.addOption("''Launch Bay:''<br>&nbsp;''Satellite: '' (current max <<= App.SF.upgrades.currentUnitMax('Satellite')>>)", "Satellite", V.SF.Squad).showTextBox()>>
 	<<if $terrain != "oceanic">>
 		<<run _options.addOption("&nbsp;''Giant Robot: '' (current max <<= App.SF.upgrades.currentUnitMax('GiantRobot')>>)", "GiantRobot", V.SF.Squad).showTextBox()>>
@@ -46,7 +46,7 @@ __Upgrades__: _size/_max(<<= (_size/_max).toFixed(2)>>%)
 	<<run _options.addOption("&nbsp;''Cruise Missile: '' (current max <<= App.SF.upgrades.currentUnitMax('MissileSilo')>>)", "MissileSilo", V.SF.Squad).showTextBox()>>
 <</if>>
 
-<<if App.SF.unlocked.navalYard('cheat')>>
+<<if App.SF.unlocked.navalYard()>>
 	<<run _options.addOption("<br><br>''Naval Yard:''<br>&nbsp;''Aircraft Carrier: '' (current max <<= App.SF.upgrades.currentUnitMax('AircraftCarrier')>>)", "AircraftCarrier", V.SF.Squad).showTextBox()>>
 	<<run _options.addOption("&nbsp;''Submarine: '' (current max <<= App.SF.upgrades.currentUnitMax('Sub')>>)", "Sub", V.SF.Squad).showTextBox()>>
 	<<run _options.addOption("&nbsp;''Amphibious Transport: '' (current max <<= App.SF.upgrades.currentUnitMax('HAT')>>)", "HAT", V.SF.Squad).showTextBox()>>