diff --git a/mods/cnc/maps/dead_in_motion_(redux).oramap b/mods/cnc/maps/dead_in_motion_(redux).oramap
index e9a7d78120..570d11c70a 100644
Binary files a/mods/cnc/maps/dead_in_motion_(redux).oramap and b/mods/cnc/maps/dead_in_motion_(redux).oramap differ
diff --git a/mods/d2k/maps/dune_boogie.oramap b/mods/d2k/maps/dune_boogie.oramap
index 4e45b6a6ef..c45fbe35ba 100644
Binary files a/mods/d2k/maps/dune_boogie.oramap and b/mods/d2k/maps/dune_boogie.oramap differ
diff --git a/mods/d2k/rules/atreides.yaml b/mods/d2k/rules/atreides.yaml
index eaf9c93afc..d01b087ba4 100644
--- a/mods/d2k/rules/atreides.yaml
+++ b/mods/d2k/rules/atreides.yaml
@@ -127,7 +127,6 @@ COMBATA:
 	Tooltip:
 		Icon: combataicon
 	Buildable:
-		Prerequisites: heavya
 		Owner: atreides
 		BuiltAt: heavya
 	RevealsShroud:
@@ -244,4 +243,4 @@ FREMEN:
 		InitialDelay: 250
 		CloakDelay: 250
 		CloakSound: 
-		UncloakSound: 
\ No newline at end of file
+		UncloakSound: 
diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml
index 625a333ffb..947ea43c0a 100644
--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -390,7 +390,7 @@ GUNTOWER:
 	Armor:
 		Type: Concrete
 	RevealsShroud:
-		Range: 6
+		Range: 7
 	RenderRangeCircle:
 	-RenderBuilding:
 	-AutoTargetIgnore:
@@ -408,7 +408,7 @@ GUNTOWER:
 		HuskActor: Guntower.Husk
 	RenderDetectionCircle:
 	DetectCloaked:
-		Range: 3
+		Range: 5
 	-Bib:
 
 GUNTOWER.Husk:
@@ -447,7 +447,7 @@ ROCKETTOWER:
 	Armor: 
 		Type: Concrete
 	RevealsShroud:
-		Range: 6
+		Range: 9
 	RenderRangeCircle:
 	-RenderBuilding:
 	-AutoTargetIgnore:
@@ -467,7 +467,7 @@ ROCKETTOWER:
 		HuskActor: Rockettower.Husk
 	RenderDetectionCircle:
 	DetectCloaked:
-		Range: 3
+		Range: 6
 	-Bib:
 
 ROCKETTOWER.Husk:
diff --git a/mods/d2k/rules/system.yaml b/mods/d2k/rules/system.yaml
index 5cfe79a7f1..40649701f4 100644
--- a/mods/d2k/rules/system.yaml
+++ b/mods/d2k/rules/system.yaml
@@ -2,38 +2,33 @@ Player:
 	TechTree:
 	ClassicProductionQueue@Building:
 		Type: Building
-		BuildSpeed: .5
 		LowPowerSlowdown: 3
 		QueuedAudio: Building
 		ReadyAudio: BuildingReady
 		BlockedAudio: NoRoom
 	ClassicProductionQueue@Infantry:
 		Type: Infantry
-		BuildSpeed: .5
 		LowPowerSlowdown: 3
 		BlockedAudio: NoRoom
 	ClassicProductionQueue@Vehicle:
 		Type: Vehicle
-		BuildSpeed: .5
 		LowPowerSlowdown: 3
 		QueuedAudio: Building
 		BlockedAudio: NoRoom
 	ClassicProductionQueue@Armor:
 		Type: Armor
-		BuildSpeed: .5
 		LowPowerSlowdown: 3
 		QueuedAudio: Building
 		BlockedAudio: NoRoom
 	ClassicProductionQueue@Starport:
 		Type: Starport
-		BuildSpeed: .8
+		BuildSpeedModified: .2
 		LowPowerSlowdown: 2
 		BlockedAudio: NoRoom
 		QueuedAudio: OrderPlaced
 		ReadyAudio:
 	ClassicProductionQueue@Aircraft:
 		Type: Aircraft
-		BuildSpeed: .4
 		LowPowerSlowdown: 3
 		QueuedAudio: Building
 		BlockedAudio: NoRoom
diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml
index 906abe94df..5b68eb2a0a 100644
--- a/mods/d2k/rules/vehicles.yaml
+++ b/mods/d2k/rules/vehicles.yaml
@@ -359,8 +359,9 @@ MISSILETANK.Husk:
 MISSILETANK.starport:
 	Inherits: MISSILETANK
 	Buildable:
+		Prerequisites: Heavy
 		Queue: Starport
 		Owner: atreides, harkonnen, ordos
 		BuiltAt: starporta, starporth, starporto
 	Valued:
-		Cost: 1250
\ No newline at end of file
+		Cost: 1250
diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml
index b1413efc69..a3f1d303a7 100644
--- a/mods/d2k/weapons.yaml
+++ b/mods/d2k/weapons.yaml
@@ -187,10 +187,10 @@ QuadRockets:
 		Spread: 3
 		Versus: 
 			None: 25%
-			Wood: 50%
+			Wood: 25%
 			Light: 85%
 			Heavy: 40%
-			Concrete: 60%
+			Concrete: 30%
 		InfDeath: 4
 		Explosion: med_explosion
 		WaterExplosion: med_splash
@@ -208,9 +208,9 @@ TurretGun:
 		Image: 90MM
 		Inaccuracy: 9
 	Warhead:
-		Spread: 5
+		Spread: 8
 		Versus: 
-			None: 25%
+			None: 50%
 			Wood: 75%
 			Light: 75%
 			Concrete: 65%
@@ -239,7 +239,7 @@ TowerMissile:
 		Speed: 45
 		RangeLimit: 50
 	Warhead:
-		Spread: 7
+		Spread: 12
 		Versus: 
 			None: 80%
 			Wood: 45%
@@ -264,8 +264,9 @@ TowerMissile:
 		Spread: 4
 		Versus: 
 			None: 30%
+			Wood: 50%
 			Light: 65%
-			Concrete: 80%
+			Concrete: 40%
 		Explosion: med_explosion
 		ImpactSound: kaboom30
 		InfDeath: 4
@@ -284,8 +285,9 @@ TowerMissile:
 		Spread: 4
 		Versus: 
 			None: 30%
+			Wood: 50%
 			Light: 65%
-			Concrete: 80%
+			Concrete: 40%
 		Explosion: med_explosion
 		ImpactSound: kaboom30
 		InfDeath: 4
@@ -306,6 +308,7 @@ DevBullet:
 		Spread: 6
 		Versus: 
 			None: 35%
+			Wood: 50%
 			Light: 65%
 			Concrete: 75%
 		Explosion: large_explosion
@@ -392,7 +395,7 @@ FakeMissile:
 			Wood: 85%
 			Light: 50%
 			Heavy: 15%
-			Concrete: 80%
+			Concrete: 50%
 		Explosion: self_destruct
 		WaterExplosion: large_splash
 		ImpactSound: explsml2