diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml
index b78b77373e..78f822c801 100644
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -232,6 +232,7 @@
 		RepairPercent: 40
 		RepairStep: 14
 	Building:
+		Adjacent: 5
 		RequiresBaseProvider: true
 		Dimensions: 1,1
 		Footprint: x
diff --git a/mods/cnc/rules/infantry.yaml b/mods/cnc/rules/infantry.yaml
index 1c180d0557..de191604b1 100644
--- a/mods/cnc/rules/infantry.yaml
+++ b/mods/cnc/rules/infantry.yaml
@@ -33,7 +33,7 @@ E2:
 		Icon: e2icnh
 	Buildable:
 		BuildPaletteOrder: 40
-		Prerequisites: hq
+		Prerequisites: anyhq
 		Owner: gdi
 	Selectable:
 		Bounds: 12,17,0,-6
@@ -93,7 +93,7 @@ E4:
 	Buildable:
 		BuildPaletteOrder: 40
 		Owner: nod
-		Prerequisites: hq
+		Prerequisites: anyhq
 	Selectable:
 		Bounds: 12,17,0,-6
 	Mobile:
diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml
index 38302258fa..f07a9dde95 100644
--- a/mods/cnc/rules/structures.yaml
+++ b/mods/cnc/rules/structures.yaml
@@ -47,6 +47,7 @@ FACT:
 	ProductionBar:
 	BaseProvider:
 		Cooldown: 200
+		Range: 14
 
 NUKE:
 	Inherits: ^Building
@@ -84,7 +85,7 @@ NUK2:
 		Prerequisite: anypower
 	Buildable:
 		BuildPaletteOrder: 30
-		Prerequisites: hq
+		Prerequisites: anyhq
 		Owner: gdi,nod
 	Building:
 		Power: 200
@@ -434,7 +435,7 @@ EYE:
 		Prerequisite: anyhq
 	Buildable:
 		BuildPaletteOrder: 100
-		Prerequisites: hq
+		Prerequisites: anyhq
 		Owner: gdi
 	Building:
 		Power: -200
@@ -474,7 +475,7 @@ TMPL:
 		Prerequisite: anyhq
 	Buildable:
 		BuildPaletteOrder: 100
-		Prerequisites: hq
+		Prerequisites: anyhq
 		Owner: nod
 	Building:
 		Power: -150
@@ -534,7 +535,7 @@ GUN:
 	RenderRangeCircle:
 	RenderDetectionCircle:
 	DetectCloaked:
-		Range: 3
+		Range: 4
 
 SAM:
 	Inherits: ^Building
@@ -653,7 +654,7 @@ GTWR:
 	DebugNextAutoTargetScanTime:
 	-AutoTargetIgnore:
 	DetectCloaked:
-		Range: 3
+		Range: 4
 	RenderDetectionCircle:
 	RenderRangeCircle:
 	WithMuzzleFlash:
@@ -672,7 +673,7 @@ ATWR:
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 60
-		Prerequisites: hq
+		Prerequisites: anyhq
 		Owner: gdi
 	Building:
 		Power: -30
diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml
index c79d1e2e82..768ac8e5b4 100644
--- a/mods/cnc/rules/vehicles.yaml
+++ b/mods/cnc/rules/vehicles.yaml
@@ -8,12 +8,12 @@ MCV:
 		Description: Deploys into another Construction Yard.\n  Unarmed
 	Buildable:
 		BuildPaletteOrder: 100
-		Prerequisites: fix
+		Prerequisites: anyhq
 		Owner: gdi,nod
 	Selectable:
 		Priority: 3
 	Mobile:
-		Speed: 4
+		Speed: 5
 	Health:
 		HP: 750
 	Armor: 
@@ -131,7 +131,7 @@ ARTY:
 		Description: Long-range artillery.\n  Strong vs Infantry, Buildings\n  Weak vs Tanks, Aircraft
 	Buildable:
 		BuildPaletteOrder: 40
-		Prerequisites: hq
+		Prerequisites: anyhq
 		Owner: nod
 	Mobile:
 		ROT: 2
@@ -165,7 +165,7 @@ FTNK:
 		Description: Heavily armored flame-throwing vehicle.\n  Strong vs Infantry, Buildings\n  Weak vs Aircraft
 	Buildable:
 		BuildPaletteOrder: 50
-		Prerequisites: hq
+		Prerequisites: anyhq
 		Owner: nod
 	Mobile:
 		ROT: 7
@@ -311,7 +311,7 @@ LTNK:
 		Description: Light Tank, good for scouting.\n  Strong vs Light Vehicles\n  Weak vs Tanks, Aircraft
 	Buildable:
 		BuildPaletteOrder: 40
-		Prerequisites: hq
+		Prerequisites: anyhq
 		Owner: nod
 	Mobile:
 		ROT: 7	
@@ -350,7 +350,7 @@ MTNK:
 		Description: General-Purpose GDI Tank.\n  Strong vs Tanks, Light Vehicles\n  Weak vs Infantry, Aircraft
 	Buildable:
 		BuildPaletteOrder: 40
-		Prerequisites: hq
+		Prerequisites: anyhq
 		Owner: gdi
 	Mobile:
 		Speed: 6
@@ -397,7 +397,7 @@ HTNK:
 		Speed: 4
 		ROT: 3
 	Health:
-		HP: 800
+		HP: 900
 	Armor:
 		Type: Heavy
 	RevealsShroud:
@@ -441,10 +441,11 @@ MSAM:
 		Description: Long range artillery.\n  Strong vs Infantry, Buildings\n  Weak vs Tanks, Aircraft
 	Buildable:
 		BuildPaletteOrder: 50
-		Prerequisites: hq
+		Prerequisites: anyhq
 		Owner: gdi
 	Mobile:
-		Speed: 7
+		Speed: 6
+		ROT: 4
 	Health:
 		HP: 120
 	Armor:
@@ -475,8 +476,8 @@ MLRS:
 		Description: Powerful anti-air unit.\nCannot attack ground units.
 	Buildable:
 		BuildPaletteOrder: 70
-		Prerequisites: hq
-		Owner: None
+		Prerequisites: anyhq
+		Owner: nod
 	Mobile:
 		Speed: 6
 	Health:
@@ -489,12 +490,9 @@ MLRS:
 		ROT: 5
 		Offset: -128,0,128
 		AlignWhenIdle: true
-	Armament@PRIMARY:
+	Armament:
 		Weapon: Patriot
-		LocalOffset: 0,-171,0
-	Armament@SECONDARY:
-		Weapon: Patriot
-		LocalOffset:0,171,0
+		LocalOffset: 0,-171,0, 0,171,0
 	AttackTurreted:
 	RenderUnitTurretedAim:
 	AutoTarget:
diff --git a/mods/cnc/weapons.yaml b/mods/cnc/weapons.yaml
index a98ae1a670..ef6de6df8b 100644
--- a/mods/cnc/weapons.yaml
+++ b/mods/cnc/weapons.yaml
@@ -281,7 +281,7 @@ OrcaAGMissiles:
 	ROF: 10
 	Burst: 1
 	BurstDelay: 0
-	Range: 5
+	Range: 4
 	Report: BAZOOK1
 	ValidTargets: Ground
 	Projectile: Missile
@@ -312,7 +312,7 @@ OrcaAAMissiles:
 	ROF: 10
 	Burst: 1
 	BurstDelay: 0
-	Range: 5
+	Range: 4
 	Report: BAZOOK1
 	ValidTargets: Air
 	Projectile: Missile
@@ -543,7 +543,7 @@ MammothMissiles:
 		Speed: 25
 		RangeLimit: 35
 	Warhead:
-		Spread: 3
+		Spread: 6
 		Versus: 
 			None: 30%
 			Wood: 75%
@@ -557,7 +557,7 @@ MammothMissiles:
 
 227mm: 
 	ROF: 140
-	Range: 14
+	Range: 12
 	MinRange: 3
 	Burst: 2
 	BurstDelay: 20
@@ -577,8 +577,8 @@ MammothMissiles:
 	Warhead:
 		Spread: 15
 		Versus: 
-			None: 30%
-			Wood: 50%
+			None: 25%
+			Wood: 25%
 			Light: 100%
 			Heavy: 50%
 		InfDeath: 4
@@ -589,7 +589,7 @@ MammothMissiles:
 
 227mm.stnk:
 	ROF: 70
-	Range: 8
+	Range: 7
 	Report: ROCKET1
 	Burst: 2
 	BurstDelay: 10