diff --git a/mods/cnc/audio/notifications.yaml b/mods/cnc/audio/notifications.yaml
index 4b58c923a2..57878440ad 100644
--- a/mods/cnc/audio/notifications.yaml
+++ b/mods/cnc/audio/notifications.yaml
@@ -18,6 +18,7 @@ Speech:
 		EnemyStructureDestroyed: estrucx
 		EnemyPlanesApproaching: enemya
 		HarvesterAttack:
+		HarvesterLost: harvlost
 		InsufficientPower: nopower1
 		IonCannonCharging: ionchrg1
 		IonCannonReady: ionredy1
@@ -47,7 +48,7 @@ Speech:
 		UnitLost: unitlost
 		UnitReady: unitredy
 		Win: accom1
-	DisablePrefixes: AirstrikeReady, BaseAttack, Building, BuildingCannotPlaceAudio, BuildingInProgress, BuildingLost, Cancelled, CivilianBuildingCaptured, CivilianKilled, ConstructionComplete, EnemyUnitsApproaching, EnemyStructureDestroyed, EnemyPlanesApproaching, HarvesterAttack, InsufficientPower, IonCannonCharging, IonCannonReady, Leave, Lose, LowPower, MissionAccomplished, MissionFailed, NewOptions, NoBuild, NodStructureDestroyed, NotReady, NuclearWarheadApproaching, NuclearWeaponAvailable, NuclearWeaponLaunched, OnHold, PrimaryBuildingSelected, Reinforce, Repairing, SelectTarget, SilosNeeded, Training, UnitLost, UnitReady, Win
+	DisablePrefixes: AirstrikeReady, BaseAttack, Building, BuildingCannotPlaceAudio, BuildingInProgress, BuildingLost, Cancelled, CivilianBuildingCaptured, CivilianKilled, ConstructionComplete, EnemyUnitsApproaching, EnemyStructureDestroyed, EnemyPlanesApproaching, HarvesterAttack, HarvesterLost, InsufficientPower, IonCannonCharging, IonCannonReady, Leave, Lose, LowPower, MissionAccomplished, MissionFailed, NewOptions, NoBuild, NodStructureDestroyed, NotReady, NuclearWarheadApproaching, NuclearWeaponAvailable, NuclearWeaponLaunched, OnHold, PrimaryBuildingSelected, Reinforce, Repairing, SelectTarget, SilosNeeded, Training, UnitLost, UnitReady, Win
 
 Sounds:
 	Notifications:
diff --git a/mods/cnc/bits/harvlost.aud b/mods/cnc/bits/harvlost.aud
new file mode 100644
index 0000000000..3097007980
Binary files /dev/null and b/mods/cnc/bits/harvlost.aud differ
diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml
index 5168b3ca55..8e840becc0 100644
--- a/mods/cnc/rules/structures.yaml
+++ b/mods/cnc/rules/structures.yaml
@@ -535,7 +535,7 @@ HPAD:
 		BuildPaletteOrder: 50
 		Prerequisites: proc
 		Queue: Building.GDI, Building.Nod
-		Description: Produces, rearms and\nrepairs helicopters
+		Description: Produces and repairs helicopters
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
@@ -1024,7 +1024,7 @@ ATWR:
 		Queue: Defence.GDI
 		BuildDuration: 2880
 		BuildDurationModifier: 40
-		Description: All-purpose defensive structure.\n  Strong vs Aircraft, Tanks\n  Weak vs Infantry
+		Description: All-purpose defensive structure.\n  Strong vs Aircraft, Infantry\n  Weak vs Tanks
 	Selectable:
 		Bounds: 24,24
 		DecorationBounds: 22,48,0,-12
diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml
index 55d7adc6fd..5aea613d9e 100644
--- a/mods/cnc/rules/vehicles.yaml
+++ b/mods/cnc/rules/vehicles.yaml
@@ -76,6 +76,8 @@ HARV:
 		Type: Heavy
 	RevealsShroud:
 		Range: 4c0
+	ActorLostNotification:
+		Notification: HarvesterLost
 	SpawnActorOnDeath:
 		Actor: HARV.Husk
 		OwnerType: InternalName
@@ -110,8 +112,6 @@ APC:
 		BuildPaletteOrder: 30
 		Prerequisites: pyle
 		Queue: Vehicle.GDI
-		BuildDuration: 938
-		BuildDurationModifier: 40
 		Description: Armed infantry transport.\nCan attack Aircraft.\n  Strong vs Vehicles\n  Weak vs Infantry
 	Mobile:
 		TurnSpeed: 20
@@ -124,9 +124,12 @@ APC:
 	Armor:
 		Type: Heavy
 	RevealsShroud:
-		Range: 6c0
+		Range: 7c0
 	Turreted:
 		TurnSpeed: 40
+	AutoTargetPriority@Air:
+		ValidTargets: Air
+		Priority: 2
 	Armament@PRIMARY:
 		Weapon: APCGun
 		Recoil: 48
@@ -238,7 +241,7 @@ FTNK:
 	Armor:
 		Type: Heavy
 	RevealsShroud:
-		Range: 5c0
+		Range: 6c0
 	Armament:
 		Weapon: BigFlamer
 		LocalOffset: 512,128,42, 512,-128,42
@@ -661,9 +664,12 @@ STNK:
 	GrantConditionOnDamageState@UNCLOAK:
 		Condition: cloak-force-disabled
 		ValidDamageStates: Critical
-	Armament:
+	Armament@PRIMARY:
 		Weapon: 227mm.stnk
 		LocalOffset: 213,43,128, 213,-43,128
+	Armament@SECONDARY:
+		Weapon: 227mm.stnkAA
+		LocalOffset: 213,43,128, 213,-43,128
 	AttackFrontal:
 	AutoTarget:
 		InitialStance: HoldFire
diff --git a/mods/cnc/sequences/structures.yaml b/mods/cnc/sequences/structures.yaml
index 02a2d59672..ec7811d77c 100644
--- a/mods/cnc/sequences/structures.yaml
+++ b/mods/cnc/sequences/structures.yaml
@@ -502,7 +502,7 @@ sam:
 		Start: 0
 	make: sammake
 		Length: 20
-		Tick: 30
+		Tick: 50
 	muzzle: samfire
 		Length: 18
 		Facings: 8
diff --git a/mods/cnc/weapons/missiles.yaml b/mods/cnc/weapons/missiles.yaml
index 0f05902743..8ff2024d9d 100644
--- a/mods/cnc/weapons/missiles.yaml
+++ b/mods/cnc/weapons/missiles.yaml
@@ -80,7 +80,7 @@ BikeRockets:
 OrcaAGMissiles:
 	Inherits: ^MissileWeapon
 	ReloadDelay: 12
-	Range: 5c0
+	Range: 4c768
 	MinRange: 1c256
 	ValidTargets: Ground, Water
 	Projectile: Missile
@@ -112,7 +112,7 @@ OrcaAAMissiles:
 MammothMissiles:
 	Inherits: ^MissileWeapon
 	ReloadDelay: 45
-	Range: 5c0
+	Range: 4c768
 	Report: rocket1.aud
 	Burst: 2
 	BurstDelays: 15
@@ -160,7 +160,7 @@ MammothMissiles:
 		Versus:
 			None: 24
 			Wood: 60
-			Light: 100
+			Light: 90
 			Heavy: 48
 	Warhead@3Eff: CreateEffect
 		Explosions: med_frag
@@ -170,6 +170,7 @@ MammothMissiles:
 	ReloadDelay: 70
 	Range: 7c0
 	Report: rocket1.aud
+	ValidTargets: Ground, Water
 	Burst: 2
 	BurstDelays: 10
 	Projectile: Missile
@@ -185,6 +186,11 @@ MammothMissiles:
 			Light: 100
 			Heavy: 90
 
+227mm.stnkAA:
+	Inherits: 227mm.stnk
+	MinRange: 2c512
+	ValidTargets: Air
+
 BoatMissile:
 	Inherits: ^MissileWeapon
 	ReloadDelay: 35
diff --git a/mods/cnc/weapons/smallcaliber.yaml b/mods/cnc/weapons/smallcaliber.yaml
index 5cb6bdcf1c..017c7cf731 100644
--- a/mods/cnc/weapons/smallcaliber.yaml
+++ b/mods/cnc/weapons/smallcaliber.yaml
@@ -152,7 +152,7 @@ APCGun:
 
 APCGun.AA:
 	Inherits: APCGun
-	Range: 6c0
+	Range: 7c0
 	ValidTargets: Air
 	Projectile: Bullet
 		Speed: 2c0