diff --git a/1.6/1.6/Assemblies/ArachnaeSwarm.dll b/1.6/1.6/Assemblies/ArachnaeSwarm.dll
index 6832e8c..2dc8609 100644
Binary files a/1.6/1.6/Assemblies/ArachnaeSwarm.dll and b/1.6/1.6/Assemblies/ArachnaeSwarm.dll differ
diff --git a/Source/ArachnaeSwarm/Wormhole/Building_WormholePortal_A.cs b/Source/ArachnaeSwarm/Wormhole/Building_WormholePortal_A.cs
index e50fb9a..f3c9f63 100644
--- a/Source/ArachnaeSwarm/Wormhole/Building_WormholePortal_A.cs
+++ b/Source/ArachnaeSwarm/Wormhole/Building_WormholePortal_A.cs
@@ -9,6 +9,7 @@ namespace ArachnaeSwarm
     public enum WormholePortalStatus
     {
         Idle,
+        Deploying,
         Linked
     }
 
@@ -146,7 +147,7 @@ namespace ArachnaeSwarm
             if (stringBuilder.Length > 0) stringBuilder.AppendLine();
             stringBuilder.Append("Status".Translate() + ": " + status.ToString().Translate());
             
-            if (linkedPortalB != null && !linkedPortalB.Destroyed)
+            if (status == WormholePortalStatus.Linked && linkedPortalB != null && !linkedPortalB.Destroyed)
             {
                 stringBuilder.AppendLine();
                 stringBuilder.Append("LinkedTo".Translate() + ": " + linkedPortalB.Map.Parent.LabelCap);
diff --git a/Source/ArachnaeSwarm/Wormhole/CompLaunchableWormhole.cs b/Source/ArachnaeSwarm/Wormhole/CompLaunchableWormhole.cs
index d28c6cb..f66755d 100644
--- a/Source/ArachnaeSwarm/Wormhole/CompLaunchableWormhole.cs
+++ b/Source/ArachnaeSwarm/Wormhole/CompLaunchableWormhole.cs
@@ -23,7 +23,7 @@ namespace ArachnaeSwarm
 
         public override IEnumerable<Gizmo> CompGetGizmosExtra()
         {
-            if (PortalA?.status == WormholePortalStatus.Linked)
+            if (PortalA?.status == WormholePortalStatus.Linked || PortalA?.status == WormholePortalStatus.Deploying)
             {
                 yield break;
             }
@@ -115,6 +115,8 @@ namespace ArachnaeSwarm
             
             Find.WorldObjects.Add(travelingWormhole);
             
+            PortalA.status = WormholePortalStatus.Deploying;
+
             return true;
         }
     }
diff --git a/Source/ArachnaeSwarm/Wormhole/DefModExtension_TravelingWormhole.cs b/Source/ArachnaeSwarm/Wormhole/DefModExtension_TravelingWormhole.cs
index 532ff50..f0f4b04 100644
--- a/Source/ArachnaeSwarm/Wormhole/DefModExtension_TravelingWormhole.cs
+++ b/Source/ArachnaeSwarm/Wormhole/DefModExtension_TravelingWormhole.cs
@@ -4,6 +4,6 @@ namespace ArachnaeSwarm
 {
     public class DefModExtension_TravelingWormhole : DefModExtension
     {
-        public float travelSpeed = 20f; // Default speed in tiles per day
+        public float travelSpeed = 5f; // 20 Default speed in tiles per day
     }
 }
\ No newline at end of file
diff --git a/Source/ArachnaeSwarm/Wormhole/TravelingWormhole.cs b/Source/ArachnaeSwarm/Wormhole/TravelingWormhole.cs
index 3c4258a..daf4c90 100644
--- a/Source/ArachnaeSwarm/Wormhole/TravelingWormhole.cs
+++ b/Source/ArachnaeSwarm/Wormhole/TravelingWormhole.cs
@@ -68,7 +68,7 @@ namespace ArachnaeSwarm
                 Pawn pilot = contents.First() as Pawn;
                 if (pilot != null)
                 {
-                    Map targetMap = GetOrGenerateMapUtility.GetOrGenerateMap(destinationTile, null);
+                    Map targetMap = GetOrGenerateMapUtility.GetOrGenerateMap(destinationTile, WorldObjectDefOf.Camp);
 
                     Building_WormholePortal_B portalB = (Building_WormholePortal_B)ThingMaker.MakeThing(ThingDef.Named("ARA_WormholePortal_B"));
                     IntVec3 cell = DropCellFinder.RandomDropSpot(targetMap);
@@ -83,7 +83,7 @@ namespace ArachnaeSwarm
 
                     if (sourcePortal != null && !sourcePortal.Destroyed)
                     {
-                        sourcePortal.SetLinkedPortal(portalB);
+                        sourcePortal.SetLinkedPortal(portalB); // This sets status to Linked
                         portalB.SetLinkedPortal(sourcePortal);
                     }
                 }