diff --git a/Moose Development/Moose/AI/AI_A2A.lua b/Moose Development/Moose/AI/AI_A2A.lua
index dc02a56a1..d9b61970f 100644
--- a/Moose Development/Moose/AI/AI_A2A.lua	
+++ b/Moose Development/Moose/AI/AI_A2A.lua	
@@ -400,7 +400,6 @@ end
 -- @param #string Event The Event string.
 -- @param #string To The To State string.
 function AI_A2A:onafterStart( Controllable, From, Event, To )
-  self:F2()
 
   self:__Status( 10 ) -- Check status status every 30 seconds.
   
@@ -423,8 +422,6 @@ end
 --- @param #AI_A2A self
 function AI_A2A:onafterStatus()
 
-  self:F( " Checking Status" )
-
   if self.Controllable and self.Controllable:IsAlive() then
   
     local RTB = false
@@ -452,7 +449,7 @@ function AI_A2A:onafterStatus()
 
     if not self:Is( "Fuel" ) and not self:Is( "Home" ) then
       local Fuel = self.Controllable:GetFuelMin()
-      self:F({Fuel=Fuel})
+      self:F({Fuel=Fuel, PatrolFuelThresholdPercentage=self.PatrolFuelThresholdPercentage})
       if Fuel < self.PatrolFuelThresholdPercentage then
         if self.TankerName then
           self:E( self.Controllable:GetName() .. " is out of fuel: " .. Fuel .. " ... Refuelling at Tanker!" )
diff --git a/Moose Development/Moose/AI/AI_A2A_Cap.lua b/Moose Development/Moose/AI/AI_A2A_Cap.lua
index 480bd39ec..41c8c8a5e 100644
--- a/Moose Development/Moose/AI/AI_A2A_Cap.lua	
+++ b/Moose Development/Moose/AI/AI_A2A_Cap.lua	
@@ -282,13 +282,14 @@ function AI_A2A_CAP:New( AICap, PatrolZone, PatrolFloorAltitude, PatrolCeilingAl
 end
 
 --- onafter State Transition for Event Patrol.
--- @param #AI_A2A_GCI self
+-- @param #AI_A2A_CAP self
 -- @param Wrapper.Group#GROUP AICap The AI Group managed by the FSM.
 -- @param #string From The From State string.
 -- @param #string Event The Event string.
 -- @param #string To The To State string.
 function AI_A2A_CAP:onafterStart( AICap, From, Event, To )
 
+  self:GetParent( self ).onafterStart( self, AICap, From, Event, To )
   AICap:HandleEvent( EVENTS.Takeoff, nil, self )
 
 end
diff --git a/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua b/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua
index 135a9a0fc..20af4f2fe 100644
--- a/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua	
+++ b/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua	
@@ -2365,7 +2365,7 @@ do -- AI_A2A_DISPATCHER
   --   A2ADispatcher = AI_A2A_DISPATCHER:New( Detection )  
   --   
   --   -- Now Setup the default fuel treshold.
-  --   A2ADispatcher:SetDefaultRefuelThreshold( 0.30 ) -- Go RTB when only 30% of fuel remaining in the tank.
+  --   A2ADispatcher:SetDefaultFuelThreshold( 0.30 ) -- Go RTB when only 30% of fuel remaining in the tank.
   --   
   function AI_A2A_DISPATCHER:SetDefaultFuelThreshold( FuelThreshold )
     
@@ -2407,7 +2407,7 @@ do -- AI_A2A_DISPATCHER
   --   A2ADispatcher = AI_A2A_DISPATCHER:New( Detection )  
   --   
   --   -- Now Setup the default fuel treshold.
-  --   A2ADispatcher:SetDefaultRefuelThreshold( 0.30 ) -- Go RTB when only 30% of fuel remaining in the tank.
+  --   A2ADispatcher:SetDefaultFuelThreshold( 0.30 ) -- Go RTB when only 30% of fuel remaining in the tank.
   --   
   --   -- Now Setup the default tanker.
   --   A2ADispatcher:SetDefaultTanker( "Tanker" ) -- The group name of the tanker is "Tanker" in the Mission Editor.
diff --git a/Moose Development/Moose/AI/AI_A2A_Gci.lua b/Moose Development/Moose/AI/AI_A2A_Gci.lua
index cc24341c3..53b7141ab 100644
--- a/Moose Development/Moose/AI/AI_A2A_Gci.lua	
+++ b/Moose Development/Moose/AI/AI_A2A_Gci.lua	
@@ -290,6 +290,7 @@ end
 -- @param #string To The To State string.
 function AI_A2A_GCI:onafterStart( AIIntercept, From, Event, To )
 
+  self:GetParent( self ).onafterStart( self, AIIntercept, From, Event, To )
   AIIntercept:HandleEvent( EVENTS.Takeoff, nil, self )
 
 end
diff --git a/Moose Development/Moose/Wrapper/Controllable.lua b/Moose Development/Moose/Wrapper/Controllable.lua
index 68f035bed..f86c5aff2 100644
--- a/Moose Development/Moose/Wrapper/Controllable.lua	
+++ b/Moose Development/Moose/Wrapper/Controllable.lua	
@@ -1654,7 +1654,6 @@ end
 --    RouteToZone( GroundGroup, ZoneList[1] )
 -- 
 function CONTROLLABLE:TaskFunction( FunctionString, ... )
-  self:E({TaskFunction=FunctionString, arguments=arg})
 
   local DCSTask