diff --git a/mods/d2/rules/frigate.yaml b/mods/d2/rules/frigate.yaml
index 12b8636..8911315 100644
--- a/mods/d2/rules/frigate.yaml
+++ b/mods/d2/rules/frigate.yaml
@@ -8,20 +8,17 @@ frigate:
 	Health:
 		HP: 500
 	Aircraft:
-		Speed: 189 # 126 * ~1.5 for balance reasons
+		IdleBehavior: LeaveMap
+		Speed: 189
 		TurnSpeed: 4
 		Repulsable: False
 		MaximumPitch: 20
 		CruiseAltitude: 192
-		IdleBehavior: LeaveMap
 		InitialFacing: 768
+		VTOL: true
+		CanHover: true
+		CanSlide: true
 	-AppearsOnRadar:
 	Cargo:
 		MaxWeight: 20
 	RejectsOrders:
-	Buildable:
-		Description: Supply spacecraft
-	WithCargoPipsDecoration:
-		Position: BottomLeft
-		RequiresSelection: true
-		PipCount: 10
diff --git a/mods/d2/rules/starport.yaml b/mods/d2/rules/starport.yaml
index 1418d6e..19a81c7 100644
--- a/mods/d2/rules/starport.yaml
+++ b/mods/d2/rules/starport.yaml
@@ -26,14 +26,54 @@ starport:
 		Type: heavy
 	RevealsShroud:
 		Range: 5c768
-	RallyPoint:
-		Path: 1,3
 	Exit@1:
-		SpawnOffset: 0,-480,0
-		ExitCell: 2,2
+		SpawnOffset: -2048,-2048,0
+		ExitCell: -1,-1
 	Exit@2:
-		SpawnOffset: 0,-480,0
-		ExitCell: 0,2
+		SpawnOffset: -1024,-2048,0
+		ExitCell: 0,-1
+	Exit@3:
+		SpawnOffset: 0,-2048,0
+		ExitCell: 1,-1
+	Exit@4:
+		SpawnOffset: 1024,-2048,0
+		ExitCell: 2,-1
+	Exit@5:
+		SpawnOffset: 2048,-2048,0
+		ExitCell: 3,-1
+	Exit@6:
+		SpawnOffset: 2048,-1024,0
+		ExitCell: 3,0
+	Exit@7:
+		SpawnOffset: 2048,0,0
+		ExitCell: 3,1
+	Exit@8:
+		SpawnOffset: 2048,1024,0
+		ExitCell: 3,2
+	Exit@9:
+		SpawnOffset: 2048,2048,0
+		ExitCell: 3,3
+	Exit@10:
+		SpawnOffset: 1024,2048,0
+		ExitCell: 2,3
+	Exit@11:
+		SpawnOffset: 0,2048,0
+		ExitCell: 1,3
+	Exit@12:
+		SpawnOffset: -1024,2048,0
+		ExitCell: 0,3
+	Exit@13:
+		SpawnOffset: -2048,2048,0
+		ExitCell: -1,3
+	Exit@14:
+		SpawnOffset: -2048,1024,0
+		ExitCell: -1,2
+	Exit@15:
+		SpawnOffset: -2048,0,0
+		ExitCell: -1,1
+	Exit@16:
+		SpawnOffset: -2048,-1024,0
+		ExitCell: -1,0
 	ProductionAirdrop:
 		Produces: Starport
 		ActorType: frigate