diff --git a/_miz/SPEARHEADDEV.miz b/_miz/SPEARHEADDEV.miz
index b078b61..9198c6b 100644
Binary files a/_miz/SPEARHEADDEV.miz and b/_miz/SPEARHEADDEV.miz differ
diff --git a/classes/stageClasses/helpers/MissionCommandsHelper.lua b/classes/stageClasses/helpers/MissionCommandsHelper.lua
index e52c911..75867c8 100644
--- a/classes/stageClasses/helpers/MissionCommandsHelper.lua
+++ b/classes/stageClasses/helpers/MissionCommandsHelper.lua
@@ -195,7 +195,7 @@ function MissionCommandsHelper:AddOverviewCommand(groupID)
             
             if enabled == true then
                 local mission = self.missionsByCode[code]
-                if mission and mission.priority == "primary" then
+                if mission and mission:getState() == "ACTIVE" and mission.priority == "primary" then
                     text = text .. formatLine(mission)
                 end
             end
@@ -207,7 +207,7 @@ function MissionCommandsHelper:AddOverviewCommand(groupID)
             
             if enabled == true then
                 local mission = self.missionsByCode[code]
-                if mission and mission.priority == "secondary" then
+                if mission and mission:getState() == "ACTIVE" and mission.priority == "secondary" then
                     text = text .. formatLine(mission)
                 end
             end
diff --git a/classes/stageClasses/helpers/SupplyUnitsTracker.lua b/classes/stageClasses/helpers/SupplyUnitsTracker.lua
index 4374429..3adc129 100644
--- a/classes/stageClasses/helpers/SupplyUnitsTracker.lua
+++ b/classes/stageClasses/helpers/SupplyUnitsTracker.lua
@@ -77,6 +77,7 @@ function SupplyUnitsTracker:Update()
 end
 
 ---@private
+---@param unit Unit
 function SupplyUnitsTracker:IsSupplyUnit(unit)
     if unit == nil then return false end
 
@@ -84,6 +85,10 @@ function SupplyUnitsTracker:IsSupplyUnit(unit)
         return true
     end
 
+    if unit:hasAttribute("Helicopters") and unit:hasAttribute("Transports") then
+        return true
+    end
+
     return false
 end
 
diff --git a/classes/stageClasses/missions/BuildableMission.lua b/classes/stageClasses/missions/BuildableMission.lua
index 6140ef8..3133ed4 100644
--- a/classes/stageClasses/missions/BuildableMission.lua
+++ b/classes/stageClasses/missions/BuildableMission.lua
@@ -174,6 +174,11 @@ function BuildableMission:SpawnActive()
     ---@param time number
     local checkForCrateTasks = function (selfA, time)
         selfA:CheckCratesInZone()
+
+        if selfA:getState() == "COMPLETED" then
+            return nil
+        end
+
         return time + 10
     end
 
diff --git a/main.lua b/main.lua
index 2c5c5f3..27b4145 100644
--- a/main.lua
+++ b/main.lua
@@ -54,7 +54,7 @@ Spearhead.LoadingDone()
 Spearhead.internal.GlobalStageManager:printFullOverview()
 
 --Check lines of code in directory per file: 
--- Get-ChildItem . -Include *.lua -Recurse | foreach {""+(Get-Content $_).Count + " => " + $_.name }; && GCI . -Include *.lua* -Recurse | foreach{(GC $_).Count} | measure-object -sum |  % Sum  
+-- Get-ChildItem . -Include *.lua -Recurse | foreach {""+(Get-Content $_).Count + " => " + $_.name }; GCI . -Include *.lua* -Recurse | foreach{(GC $_).Count} | measure-object -sum |  % Sum  
 -- find . -name '*.lua' | xargs wc -l
 
 --- ==================== DEBUG ORDER OR ZONE VEC ===========================