diff --git a/Moose Development/Moose/AI/AI_Cargo_Helicopter.lua b/Moose Development/Moose/AI/AI_Cargo_Helicopter.lua
index 79f664a12..3a83a48ae 100644
--- a/Moose Development/Moose/AI/AI_Cargo_Helicopter.lua	
+++ b/Moose Development/Moose/AI/AI_Cargo_Helicopter.lua	
@@ -277,7 +277,7 @@ function AI_CARGO_HELICOPTER:onafterLanded( Helicopter, From, Event, To )
     self:F( { Helicopter:GetName(), Height = Helicopter:GetHeight( true ), Velocity = Helicopter:GetVelocityKMH() } )
 
     if self.RoutePickup == true then
-      if Helicopter:GetHeight( true ) <= 5.5 and Helicopter:GetVelocityKMH() < 10 then
+      if Helicopter:GetHeight( true ) <= 5.5 and Helicopter:GetVelocityKMH() < 15 then
         --self:Load( Helicopter:GetPointVec2() )
         self:Load( self.PickupZone )
         self.RoutePickup = false
@@ -285,7 +285,7 @@ function AI_CARGO_HELICOPTER:onafterLanded( Helicopter, From, Event, To )
     end
     
     if self.RouteDeploy == true then
-      if Helicopter:GetHeight( true ) <= 5.5 and Helicopter:GetVelocityKMH() < 10 then
+      if Helicopter:GetHeight( true ) <= 5.5 and Helicopter:GetVelocityKMH() < 15 then
         self:Unload( self.DeployZone )
         self.RouteDeploy = false
       end
diff --git a/Moose Development/Moose/Core/Point.lua b/Moose Development/Moose/Core/Point.lua
index 4a0b76da9..dff81d026 100644
--- a/Moose Development/Moose/Core/Point.lua	
+++ b/Moose Development/Moose/Core/Point.lua	
@@ -1239,7 +1239,7 @@ do -- COORDINATE
 
     -- ETA.
     RoutePoint.ETA=0
-    RoutePoint.ETA_locked=true
+    RoutePoint.ETA_locked=false
 
     -- Waypoint description.
     RoutePoint.name=description
@@ -1388,7 +1388,7 @@ do -- COORDINATE
     RoutePoint.formation_template=""
 
     RoutePoint.ETA=0
-    RoutePoint.ETA_locked=true
+    RoutePoint.ETA_locked=false
 
     RoutePoint.speed = ( Speed or 20 ) / 3.6
     RoutePoint.speed_locked = true
@@ -1423,7 +1423,7 @@ do -- COORDINATE
     RoutePoint.formation_template = ""
 
     RoutePoint.ETA=0
-    RoutePoint.ETA_locked=true
+    RoutePoint.ETA_locked=false
 
     RoutePoint.speed = ( Speed or 20 ) / 3.6
     RoutePoint.speed_locked = true
diff --git a/Moose Development/Moose/Functional/Sead.lua b/Moose Development/Moose/Functional/Sead.lua
index 7c9b5d8b0..8eb98d4f4 100644
--- a/Moose Development/Moose/Functional/Sead.lua	
+++ b/Moose Development/Moose/Functional/Sead.lua	
@@ -17,7 +17,7 @@
 --
 -- ### Authors: **FlightControl**, **applevangelist**
 --
--- Last Update: Feb 2021
+-- Last Update: April 2021
 --
 -- ===
 --
diff --git a/Moose Development/Moose/Functional/Shorad.lua b/Moose Development/Moose/Functional/Shorad.lua
index 8a25cb198..82d8a1482 100644
--- a/Moose Development/Moose/Functional/Shorad.lua	
+++ b/Moose Development/Moose/Functional/Shorad.lua	
@@ -1,20 +1,20 @@
 --- **Functional** -- Short Range Air Defense System
--- 
+--
 -- ===
--- 
+--
 -- **SHORAD** - Short Range Air Defense System
 -- Controls a network of short range air/missile defense groups.
--- 
+--
 -- ===
--- 
+--
 -- ## Missions:
 --
 -- ### [SHORAD - Short Range Air Defense](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/SRD%20-%20SHORAD%20Defense)
--- 
+--
 -- ===
--- 
+--
 -- ### Author : **applevangelist **
--- 
+--
 -- @module Functional.Shorad
 -- @image Functional.Shorad.jpg
 --
@@ -26,7 +26,7 @@
 -- @field #string ClassName
 -- @field #string name Name of this Shorad
 -- @field #boolean debug Set the debug state
--- @field #string Prefixes String to be used to build the @{#Core.Set#SET_GROUP} 
+-- @field #string Prefixes String to be used to build the @{#Core.Set#SET_GROUP}
 -- @field #number Radius Shorad defense radius in meters
 -- @field Core.Set#SET_GROUP Groupset The set of Shorad groups
 -- @field Core.Set#SET_GROUP Samset The set of SAM groups to defend
@@ -41,10 +41,10 @@
 -- @field #boolean UseEmOnOff Decide if we are using Emission on/off (default) or AlarmState red/green.
 -- @extends Core.Base#BASE
 
---- *Good friends are worth defending.* Mr Tushman, Wonder (the Movie) 
--- 
+--- *Good friends are worth defending.* Mr Tushman, Wonder (the Movie)
+--
 -- Simple Class for a more intelligent Short Range Air Defense System
--- 
+--
 -- #SHORAD
 -- Moose derived missile intercepting short range defense system.
 -- Protects a network of SAM sites. Uses events to switch on the defense groups closest to the enemy.
@@ -52,26 +52,26 @@
 --
 -- ## Usage
 --
--- Set up a #SET_GROUP for the SAM sites to be protected:  
--- 
---        `local SamSet = SET_GROUP:New():FilterPrefixes("Red SAM"):FilterCoalitions("red"):FilterStart()`   
---    
--- By default, SHORAD will defense against both HARMs and AG-Missiles with short to medium range. The default defense probability is 70-90%.
--- When a missile is detected, SHORAD will activate defense groups in the given radius around the target for 10 minutes. It will *not* react to friendly fire.    
---        
--- ### Start a new SHORAD system, parameters are:
---   
---  * Name: Name of this SHORAD.  
---  * ShoradPrefix: Filter for the Shorad #SET_GROUP.  
---  * Samset: The #SET_GROUP of SAM sites to defend.  
---  * Radius: Defense radius in meters. 
---  * ActiveTimer: Determines how many seconds the systems stay on red alert after wake-up call.  
---  * Coalition: Coalition, i.e. "blue", "red", or "neutral".* 
---    
---        `myshorad = SHORAD:New("RedShorad", "Red SHORAD", SamSet, 25000, 600, "red")`       
+-- Set up a #SET_GROUP for the SAM sites to be protected:
+--
+--        `local SamSet = SET_GROUP:New():FilterPrefixes("Red SAM"):FilterCoalitions("red"):FilterStart()`
+--
+-- By default, SHORAD will defense against both HARMs and AG-Missiles with short to medium range. The default defense probability is 70-90%.
+-- When a missile is detected, SHORAD will activate defense groups in the given radius around the target for 10 minutes. It will *not* react to friendly fire.
+--
+-- ### Start a new SHORAD system, parameters are:
+--
+--  * Name: Name of this SHORAD.
+--  * ShoradPrefix: Filter for the Shorad #SET_GROUP.
+--  * Samset: The #SET_GROUP of SAM sites to defend.
+--  * Radius: Defense radius in meters.
+--  * ActiveTimer: Determines how many seconds the systems stay on red alert after wake-up call.
+--  * Coalition: Coalition, i.e. "blue", "red", or "neutral".*
+--
+--        `myshorad = SHORAD:New("RedShorad", "Red SHORAD", SamSet, 25000, 600, "red")`
+--
+-- ## Customize options
 --
--- ## Customize options   
---  
 --  * SHORAD:SwitchDebug(debug)
 --  * SHORAD:SwitchHARMDefense(onoff)
 --  * SHORAD:SwitchAGMDefense(onoff)
@@ -96,7 +96,7 @@ SHORAD = {
   DefendMavs = true,
   DefenseLowProb = 70,
   DefenseHighProb = 90,
-  UseEmOnOff = false,  
+  UseEmOnOff = false,
 }
 
 -----------------------------------------------------------------------
@@ -137,7 +137,7 @@ do
   ["X_31"] = "X_31",
   ["Kh25"] = "Kh25",
   }
-  
+
   --- TODO complete list?
   -- @field Mavs
   SHORAD.Mavs = {
@@ -148,7 +148,7 @@ do
   ["Kh31"] = "Kh31",
   ["Kh66"] = "Kh66",
   }
-  
+
   --- Instantiates a new SHORAD object
   -- @param #SHORAD self
   -- @param #string Name Name of this SHORAD
@@ -157,10 +157,10 @@ do
   -- @param #number Radius Defense radius in meters, used to switch on groups
   -- @param #number ActiveTimer Determines how many seconds the systems stay on red alert after wake-up call
   -- @param #string Coalition Coalition, i.e. "blue", "red", or "neutral"
-  function SHORAD:New(Name, ShoradPrefix, Samset, Radius, ActiveTimer, Coalition) 
+  function SHORAD:New(Name, ShoradPrefix, Samset, Radius, ActiveTimer, Coalition)
     local self = BASE:Inherit( self, BASE:New() )
     self:T({Name, ShoradPrefix, Samset, Radius, ActiveTimer, Coalition})
-    
+
     local GroupSet = SET_GROUP:New():FilterPrefixes(ShoradPrefix):FilterCoalitions(Coalition):FilterCategoryGround():FilterStart()
 
     self.name = Name or "MyShorad"
@@ -183,7 +183,7 @@ do
     self:_InitState()
     return self
   end
-  
+
   --- Initially set all groups to alarm state GREEN
   -- @param #SHORAD self
   function SHORAD:_InitState()
@@ -204,7 +204,7 @@ do
       math.random()
     end
   end
-  
+
   --- Switch debug state
   -- @param #SHORAD self
   -- @param #boolean debug Switch debug on (true) or off (false)
@@ -221,7 +221,7 @@ do
       BASE:TraceOff()
     end
   end
-  
+
   --- Switch defense for HARMs
   -- @param #SHORAD self
   -- @param #boolean onoff
@@ -230,7 +230,7 @@ do
     local onoff = onoff or true
     self.DefendHarms = onoff
   end
-  
+
   --- Switch defense for AGMs
   -- @param #SHORAD self
   -- @param #boolean onoff
@@ -239,7 +239,7 @@ do
     local onoff = onoff or true
     self.DefendMavs = onoff
   end
-  
+
   --- Set defense probability limits
   -- @param #SHORAD self
   -- @param #number low Minimum detection limit, integer 1-100
@@ -257,7 +257,7 @@ do
     self.DefenseLowProb = low
     self.DefenseHighProb = high
   end
-  
+
   --- Set the number of seconds a SHORAD site will stay active
   -- @param #SHORAD self
   -- @param #number seconds Number of seconds systems stay active
@@ -271,7 +271,7 @@ do
 
   --- Set the number of meters for the SHORAD defense zone
   -- @param #SHORAD self
-  -- @param #number meters Radius of the defense search zone in meters. #SHORADs in this range around a targeted group will go active 
+  -- @param #number meters Radius of the defense search zone in meters. #SHORADs in this range around a targeted group will go active
   function SHORAD:SetDefenseRadius(meters)
     local radius = meters or 20000
     if radius < 0 then
@@ -279,14 +279,14 @@ do
     end
     self.Radius = radius
   end
-  
+
   --- Set using Emission on/off instead of changing alarm state
   -- @param #SHORAD self
   -- @param #boolean switch Decide if we are changing alarm state or AI state
   function SHORAD:SetUsingEmOnOff(switch)
     self.UseEmOnOff = switch or false
   end
-  
+
   --- Check if a HARM was fired
   -- @param #SHORAD self
   -- @param #string WeaponName
@@ -301,7 +301,7 @@ do
     end
     return hit
   end
-  
+
   --- Check if an AGM was fired
   -- @param #SHORAD self
   -- @param #string WeaponName
@@ -316,7 +316,7 @@ do
     end
     return hit
   end
-  
+
   --- Check the coalition of the attacker
   -- @param #SHORAD self
   -- @param #string Coalition name
@@ -324,7 +324,7 @@ do
   function SHORAD:_CheckCoalition(Coalition)
     local owncoalition = self.Coalition
     local othercoalition = ""
-    if Coalition == 0 then 
+    if Coalition == 0 then
       othercoalition = "neutral"
     elseif Coalition == 1 then
       othercoalition = "red"
@@ -338,7 +338,7 @@ do
       return false
     end
   end
-  
+
   --- Check if the missile is aimed at a SHORAD
   -- @param #SHORAD self
   -- @param #string TargetGroupName Name of the target group
@@ -352,12 +352,12 @@ do
       local groupname = _groups:GetName()
       if string.find(groupname, tgtgrp, 1) then
         returnname = true
-        _groups:RelocateGroundRandomInRadius(7,125,false,false) -- be a bit evasive
+        _groups:RelocateGroundRandomInRadius(7,100,false,false) -- be a bit evasive
       end
     end
-    return returnname  
+    return returnname
   end
-  
+
   --- Check if the missile is aimed at a SAM site
   -- @param #SHORAD self
   -- @param #string TargetGroupName Name of the target group
@@ -376,7 +376,7 @@ do
     end
     return returnname
   end
-  
+
   --- Calculate if the missile shot is detected
   -- @param #SHORAD self
   -- @return #boolean Returns true for a detection, else false
@@ -389,15 +389,15 @@ do
     end
     return IsDetected
   end
-  
+
   --- Wake up #SHORADs in a zone with diameter Radius for ActiveTimer seconds
   -- @param #SHORAD self
   -- @param #string TargetGroup Name of the target group used to build the #ZONE
   -- @param #number Radius Radius of the #ZONE
   -- @param #number ActiveTimer Number of seconds to stay active
   -- @param #number TargetCat (optional) Category, i.e. Object.Category.UNIT or Object.Category.STATIC
-  -- @usage Use this function to integrate with other systems, example   
-  -- 
+  -- @usage Use this function to integrate with other systems, example
+  --
   -- local SamSet = SET_GROUP:New():FilterPrefixes("Blue SAM"):FilterCoalitions("blue"):FilterStart()
   -- myshorad = SHORAD:New("BlueShorad", "Blue SHORAD", SamSet, 22000, 600, "blue")
   -- myshorad:SwitchDebug(true)
@@ -455,13 +455,13 @@ do
       end
     end
   end
-  
+
   --- Main function - work on the EventData
   -- @param #SHORAD self
   -- @param Core.Event#EVENTDATA EventData The event details table data set
   function SHORAD:OnEventShot( EventData )
     self:T( { EventData } )
-  
+
     --local ShootingUnit = EventData.IniDCSUnit
     --local ShootingUnitName = EventData.IniDCSUnitName
     local ShootingWeapon = EventData.Weapon -- Identify the weapon fired
@@ -473,7 +473,7 @@ do
       local IsDetected = self:_ShotIsDetected()
       -- convert to text
       local DetectedText = "false"
-      if IsDetected then 
+      if IsDetected then
         DetectedText = "true"
       end
       local text = string.format("%s Missile Launched = %s | Detected probability state is %s", self.lid, ShootingWeaponName, DetectedText)
@@ -490,7 +490,7 @@ do
           targetunit = UNIT:Find(targetdata)
         elseif targetcat == Object.Category.STATIC then  -- STATIC
           targetunit = STATIC:Find(targetdata)
-        end   
+        end
         --local targetunitname = Unit.getName(targetdata) -- Unit name
         if targetunit and targetunit:IsAlive() then
           local targetunitname = targetunit:GetName()
@@ -507,7 +507,7 @@ do
           local text = string.format("%s Missile Target = %s", self.lid, tostring(targetgroupname))
           self:T( text )
           local m = MESSAGE:New(text,10,"Info"):ToAllIf(self.debug)
-          -- check if we or a SAM site are the target 
+          -- check if we or a SAM site are the target
           --local TargetGroup = EventData.TgtGroup -- Wrapper.Group#GROUP
           local shotatus = self:_CheckShotAtShorad(targetgroupname) --#boolean
           local shotatsams = self:_CheckShotAtSams(targetgroupname) --#boolean
@@ -516,12 +516,12 @@ do
             self:T({shotatsams=shotatsams,shotatus=shotatus})
             self:WakeUpShorad(targetgroupname, self.Radius, self.ActiveTimer, targetcat)
           end
-        end  
+        end
       end
     end
-  end 
+  end
 --
 end
 -----------------------------------------------------------------------
 -- SHORAD end
------------------------------------------------------------------------
\ No newline at end of file
+-----------------------------------------------------------------------