diff --git a/Moose Development/Moose/Core/Database.lua b/Moose Development/Moose/Core/Database.lua
index 0d6d2bb35..b30329ecf 100644
--- a/Moose Development/Moose/Core/Database.lua	
+++ b/Moose Development/Moose/Core/Database.lua	
@@ -327,20 +327,17 @@ do -- Zones
               
         Zone=ZONE_POLYGON_BASE:New(ZoneName, ZoneData.verticies)
         
-        for i,vec2 in pairs(ZoneData.verticies) do
-          local coord=COORDINATE:NewFromVec2(vec2)
-          coord:MarkToAll(string.format("%s Point %d", ZoneName, i))
-        end
+        --for i,vec2 in pairs(ZoneData.verticies) do
+        --  local coord=COORDINATE:NewFromVec2(vec2)
+        --  coord:MarkToAll(string.format("%s Point %d", ZoneName, i))
+        --end
       
       end
       
       if Zone then
 
-        -- Debug output.
-        --self:I({"Register ZONE: %s (", Name = ZoneName})
-        
+        -- Store color of zone.        
         Zone.Color=color
-
       
         -- Store in DB.
         self.ZONENAMES[ZoneName] = ZoneName
diff --git a/Moose Development/Moose/Core/Point.lua b/Moose Development/Moose/Core/Point.lua
index 8c30032c0..f79d54593 100644
--- a/Moose Development/Moose/Core/Point.lua	
+++ b/Moose Development/Moose/Core/Point.lua	
@@ -2121,23 +2121,28 @@ do -- COORDINATE
     -- @param #string Text (Optional) Text displayed when mark is added. Default none.
     -- @return #number The resulting Mark ID, which is a number. Can be used to remove the object again. 
     function COORDINATE:MarkupToAllFreeForm(Coordinates, Coalition, Color, Alpha, FillColor, FillAlpha, LineType, ReadOnly, Text)
+    
       local MarkID = UTILS.GetMarkID()
       if ReadOnly==nil then
         ReadOnly=false
       end
+      
       Coalition=Coalition or -1
+      
       Color=Color or {1,0,0}
       Color[4]=Alpha or 1.0
+      
       LineType=LineType or 1
-      FillColor=FillColor or Color
+      
+      FillColor=FillColor or UTILS.DeepCopy(Color)      
       FillColor[4]=FillAlpha or 0.15
       
       local vecs={}
-      table.insert(vecs, self:GetVec3())
-      for _,coord in ipairs(Coordinates) do
-        table.insert(vecs, coord:GetVec3())
+      vecs[1]=self:GetVec3()
+      for i,coord in ipairs(Coordinates) do
+        vecs[i+1]=coord:GetVec3()
       end
-      
+
       if #vecs<3 then
         self:E("ERROR: A free form polygon needs at least three points!")
       elseif #vecs==3 then
@@ -2147,7 +2152,7 @@ do -- COORDINATE
       elseif #vecs==5 then
         trigger.action.markupToAll(7, Coalition, MarkID, vecs[1], vecs[2], vecs[3], vecs[4], vecs[5], Color, FillColor, LineType, ReadOnly, Text or "")
       elseif #vecs==6 then
-        trigger.action.markupToAll(7, Coalition, MarkID, vecs[1], vecs[2], vecs[3], vecs[4], vecs[5], vecs[6], Color, FillColor, LineType, ReadOnly, Text or "")        
+        trigger.action.markupToAll(7, Coalition, MarkID, vecs[1], vecs[2], vecs[3], vecs[4], vecs[5], vecs[6], Color, FillColor, LineType, Text or "")
       elseif #vecs==7 then
         trigger.action.markupToAll(7, Coalition, MarkID, vecs[1], vecs[2], vecs[3], vecs[4], vecs[5], vecs[6], vecs[7], Color, FillColor, LineType, ReadOnly, Text or "")
       elseif #vecs==8 then
diff --git a/Moose Development/Moose/Core/Zone.lua b/Moose Development/Moose/Core/Zone.lua
index 035d0e2a4..8ad723486 100644
--- a/Moose Development/Moose/Core/Zone.lua	
+++ b/Moose Development/Moose/Core/Zone.lua	
@@ -1723,7 +1723,7 @@ function ZONE_POLYGON_BASE:DrawZone(Coalition, Color, Alpha, FillColor, FillAlph
   
     local Coordinates=self:GetVerticiesCoordinates()
     table.remove(Coordinates, 1)
-  
+
     self.DrawID=coordinate:MarkupToAllFreeForm(Coordinates, Coalition, Color, Alpha, FillColor, FillAlpha, LineType, ReadOnly)
   
   end