diff --git a/mods/d2k/rules/atreides.yaml b/mods/d2k/rules/atreides.yaml
index 3c45021d27..2d84663dc4 100644
--- a/mods/d2k/rules/atreides.yaml
+++ b/mods/d2k/rules/atreides.yaml
@@ -141,6 +141,10 @@ COMBATA:
 		Prerequisites: heavya
 		Owner: atreides
 		BuiltAt: heavya
+	RevealsShroud:
+		Range: 8
+	Turreted:
+		ROT: 6
 	Armament:
 		Weapon: 90mma
 		Recoil: 171
diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml
index 4753869b0d..0c88cd9aea 100644
--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -123,19 +123,19 @@
 	Armor:
 		Type: None
 	RevealsShroud:
-		Range: 4
+		Range: 6
 	Mobile:
 		Crushes: crate
 		SharesCell: true
 		TerrainSpeeds:
-			Sand: 80
-			Rock: 90
-			Transition: 85
+			Sand: 90
+			Rock: 100
+			Transition: 95
 			Concrete: 100
-			Spice: 80
-			SpiceBlobs: 70
-			Dune: 60
-			Rough: 65
+			Spice: 85
+			SpiceBlobs: 80
+			Dune: 75
+			Rough: 75
 	SelectionDecorations:
 	Selectable:
 		Voice: InfantryVoice
@@ -265,3 +265,4 @@
 	GivesBounty:
 	C4Demolishable:
 	DebugMuzzlePositions:
+	Bib:
diff --git a/mods/d2k/rules/harkonnen.yaml b/mods/d2k/rules/harkonnen.yaml
index 2aad623822..6e39f0f2e1 100644
--- a/mods/d2k/rules/harkonnen.yaml
+++ b/mods/d2k/rules/harkonnen.yaml
@@ -164,6 +164,11 @@ COMBATH:
 		Prerequisites: heavyh
 		Owner: harkonnen
 		BuiltAt: heavyh
+	Mobile:
+		Speed: 6
+		ROT: 4
+	Turreted:
+		ROT: 5
 	Health:
 		HP: 400
 	RenderUnitTurreted:
diff --git a/mods/d2k/rules/ordos.yaml b/mods/d2k/rules/ordos.yaml
index 7fd7410197..e658f70288 100644
--- a/mods/d2k/rules/ordos.yaml
+++ b/mods/d2k/rules/ordos.yaml
@@ -112,11 +112,14 @@ COMBATO:
 		Prerequisites: heavyo
 		Owner: ordos
 		BuiltAt: heavyo
-	Mobile:
-		Speed: 9
-		Crushes: crate, infantry
+	RevealsShroud:
+		Range: 8
 	Turreted:
-		ROT: 7
+		ROT: 8
+	Mobile:
+		Speed: 10
+		ROT: 8
+		Crushes: crate, infantry
 	RenderUnitTurreted:
 		Image: COMBATO
 	LeavesHusk:
diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml
index 124edae33b..446cc663a9 100644
--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -16,7 +16,7 @@
 	Armor:
 		Type: Concrete
 	RevealsShroud:
-		Range: 6
+		Range: 10
 	Production:
 		Produces: Building
 	Valued:
@@ -199,7 +199,7 @@ RESEARCH:
 		Description: Harvesters unload Spice here for processing
 	Building:
 		Power: -30
-		Footprint: =xx xx=
+		Footprint: xxx x==
 		Dimensions: 3,2
 	Health:
 		HP: 900
@@ -211,6 +211,7 @@ RESEARCH:
 	OreRefinery:
 		DockOffset: 2,1
 		DockAngle: 160
+		TickRate: 25
 	StoresOre:
 		PipColor: green
 		PipCount: 10
@@ -676,4 +677,4 @@ HEAVYC:
 #	Wall:
 #		CrushClasses: plates
 #	-SelectionDecorations:
-#	-Selectable:
\ No newline at end of file
+#	-Selectable:
diff --git a/mods/d2k/rules/system.yaml b/mods/d2k/rules/system.yaml
index e223d9b035..5cfe79a7f1 100644
--- a/mods/d2k/rules/system.yaml
+++ b/mods/d2k/rules/system.yaml
@@ -2,7 +2,7 @@ Player:
 	TechTree:
 	ClassicProductionQueue@Building:
 		Type: Building
-		BuildSpeed: .4
+		BuildSpeed: .5
 		LowPowerSlowdown: 3
 		QueuedAudio: Building
 		ReadyAudio: BuildingReady
@@ -20,7 +20,7 @@ Player:
 		BlockedAudio: NoRoom
 	ClassicProductionQueue@Armor:
 		Type: Armor
-		BuildSpeed: .4
+		BuildSpeed: .5
 		LowPowerSlowdown: 3
 		QueuedAudio: Building
 		BlockedAudio: NoRoom
@@ -286,8 +286,8 @@ World:
 	ChooseBuildTabOnSelect:
 	CrateSpawner:
 		Minimum: 1
-		Maximum: 3
-		SpawnInterval: 120
+		Maximum: 2
+		SpawnInterval: 60
 		WaterChance: 0
 		ValidGround: Sand, Dune, Rock
 	PaletteFromCurrentTileset:
@@ -364,7 +364,7 @@ World:
 		Palette: d2k
 		TerrainType: Spice
 		SpriteNames: spice1
-		ValuePerUnit: 50
+		ValuePerUnit: 25
 		Name: Spice
 		PipColor: green
 		AllowedTerrainTypes: Sand
@@ -402,87 +402,74 @@ CRATE:
 		Lifetime: 120
 		TerrainTypes: Sand, Dune, Rock
 	GiveCashCrateAction@1:
-		Amount: 1000
-		SelectionShares: 40
+		Amount: 500
+		SelectionShares: 20
 		UseCashTick: yes
 	GiveCashCrateAction@2:
-		Amount: 2000
-		SelectionShares: 15
+		Amount: 750
+		SelectionShares: 50
 		UseCashTick: yes
 	GiveCashCrateAction@3:
-		Amount: 5000
-		SelectionShares: 5
+		Amount: 1000
+		SelectionShares: 30
 		UseCashTick: yes
-	LevelUpCrateAction:
-		SelectionShares: 40
-	ExplodeCrateAction@boom:
-		Weapon: CrateExplosion
+	GiveCashCrateAction@4:
+		Amount: 1500
 		SelectionShares: 10
-	ExplodeCrateAction@nuke:
-		Weapon: CrateNuke
-		SelectionShares: 5
-	HideMapCrateAction:
-		SelectionShares: 3
-		Effect: hide-map
-	RevealMapCrateAction:
-		SelectionShares: 2
-		Effect: reveal-map
+		UseCashTick: yes
 	GiveMcvCrateAction@Atreides:
-		SelectionShares: 3
+		SelectionShares: 0
 		NoBaseSelectionShares: 9001
 		Unit: mcva
 	GiveMcvCrateAction@Harkonnen:
-		SelectionShares: 3
+		SelectionShares: 0
 		NoBaseSelectionShares: 9001
 		Unit: mcvh
 	GiveMcvCrateAction@Ordos:
-		SelectionShares: 3
+		SelectionShares: 0
 		NoBaseSelectionShares: 9001
 		Unit: mcvo
 	GiveUnitCrateAction@TrikeA:
-		SelectionShares: 13#8
+		SelectionShares: 20
 		Unit: trikea
-	#GiveUnitCrateAction@TrikeH:
-	#	SelectionShares: 6
-	#	Unit: trikeh
-	GiveUnitCrateAction@Quad:
-		SelectionShares: 18
-		Unit: quad
 	GiveUnitCrateAction@TrikeO:
-		SelectionShares: 5
+		SelectionShares: 20
 		Unit: trikeo
-	GiveUnitCrateAction@SiegeTank:
-		SelectionShares: 18
-		Unit: siegetank
-	GiveUnitCrateAction@MissileTank:
-		SelectionShares: 12
-		Unit: missiletank
+	GiveUnitCrateAction@Quad:
+		SelectionShares: 40
+		Unit: quad
 	GiveUnitCrateAction@CombatA:
-		SelectionShares: 6
+		SelectionShares: 10
 		Unit: combata
 	GiveUnitCrateAction@CombatH:
-		SelectionShares: 6
+		SelectionShares: 10
 		Unit: combath
 	GiveUnitCrateAction@CombatO:
-		SelectionShares: 6
+		SelectionShares: 10
 		Unit: combato
+	GiveUnitCrateAction@SiegeTank:
+		SelectionShares: 10
+		Unit: siegetank
+	GiveUnitCrateAction@MissileTank:
+		SelectionShares: 10
+		Unit: missiletank
 	GiveUnitCrateAction@Fremen:
-		SelectionShares: 4
+		SelectionShares: 5
 		Unit: fremen
 	GiveUnitCrateAction@Sardaukar:
-		SelectionShares: 6
+		SelectionShares: 8
 		Unit: sardaukar
 	GiveUnitCrateAction@Saboteur:
-		SelectionShares: 2
+		SelectionShares: 3
 		Unit: saboteur
 	GiveUnitCrateAction@SonicTank:
-		SelectionShares: 3
+		SelectionShares: 5
 		Unit: sonictank
 	GiveUnitCrateAction@Devast:
-		SelectionShares: 4
-		Unit: devast
-	GiveUnitCrateAction@deviatortank:
 		SelectionShares: 2
+		Unit: devast
+	GiveUnitCrateAction@DeviatorTank:
+		SelectionShares: 7
 		Unit: deviatortank
 	RenderSimple:
 	BelowUnits:
@@ -551,4 +538,4 @@ SPICEBLOOM:
 #	BelowUnits:
 #	GivesExperience:
 #	GivesBounty:
-#	DrawLineToTarget:
\ No newline at end of file
+#	DrawLineToTarget:
diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml
index 9a63161572..d3d6b9e312 100644
--- a/mods/d2k/rules/vehicles.yaml
+++ b/mods/d2k/rules/vehicles.yaml
@@ -21,7 +21,7 @@
 		Speed: 6
 		Crushes: crate, infantry
 	RevealsShroud:
-		Range: 4
+		Range: 8
 	MustBeDestroyed:
 	BaseBuilding:
 	-AttackMove:
@@ -62,10 +62,10 @@ HARVESTER:
 		Priority: 7
 		Bounds: 42,42
 	Harvester:
-		PipCount: 7
-		Capacity: 14
+		PipCount: 10
+		Capacity: 40
 		Resources: Spice
-		UnloadTicksPerBale: 15
+		UnloadTicksPerBale: 6
 		# How far away from our linked refinery to find resources (in cells):
 		SearchFromProcRadius: 24
 		# How far away from last harvest order location to find more resources (in cells):
@@ -215,7 +215,7 @@ QUAD.starport:
 		Speed: 7
 		Crushes: crate, infantry
 	RevealsShroud:
-		Range: 6
+		Range: 7
 	Turreted:
 		ROT: 6
 		AlignWhenIdle: true
@@ -267,7 +267,7 @@ SIEGETANK:
 		ROT: 3
 		Crushes: crate, infantry
 	RevealsShroud:
-		Range: 5
+		Range: 8
 	Turreted:
 		ROT: 3
 	Armament:
@@ -330,7 +330,7 @@ MISSILETANK:
 	Armor:
 		Type: Light
 	RevealsShroud:
-		Range: 6
+		Range: 8
 	RenderUnit:
 		Image: MISSILETANK
 	Armament:
@@ -363,4 +363,4 @@ MISSILETANK.starport:
 		Owner: atreides, harkonnen, ordos
 		BuiltAt: starporta, starporth, starporto
 	Valued:
-		Cost: 699
\ No newline at end of file
+		Cost: 699
diff --git a/mods/d2k/sequences.yaml b/mods/d2k/sequences.yaml
index d564e07a99..28dd8eb311 100644
--- a/mods/d2k/sequences.yaml
+++ b/mods/d2k/sequences.yaml
@@ -21,7 +21,7 @@ harvester:
 		Start: 32
 		Length: 8
 		Facings: 8
-		Tick: 150
+		Tick: 40
 	dock: unload
 		Start: 0
 		Length: 10
diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml
index 379f90dc47..25d3511873 100644
--- a/mods/d2k/weapons.yaml
+++ b/mods/d2k/weapons.yaml
@@ -50,6 +50,152 @@ Dragon:
 		Damage: 50
 		ImpactSound: kaboom12
 
+RedEye:
+	ROF: 50
+	Range: 8
+	Report: BAZOOK1
+	ValidTargets: Air
+	Projectile: Missile
+		Arm: 3
+		High: true
+		Shadow: true
+		Proximity: true
+#		Trail: smokey
+		ContrailLength: 10
+		Image: MISSILE
+		ROT: 20
+		RangeLimit: 30
+		Speed: 40
+	Warhead:
+		Spread: 3
+		Versus: 
+			None: 90%
+			Wood: 75%
+			Light: 60%
+			Heavy: 25%
+		Explosion: med_explosion
+		InfDeath: 3
+		SmudgeType: SandCrater, RockCrater
+		Damage: 60
+		ImpactSound: kaboom12
+
+Sniper:
+	ROF: 100
+	Range: 8.5
+	Report: RIFLE
+	Projectile: Bullet
+		Speed: 150
+		ContrailLength: 6
+		TrailInterval: 1
+		ContrailDelay: 0
+		ContrailUsePlayerColor: true
+	Warhead: 
+		Damage: 60
+		Spread: 1
+		Versus: 
+			None: 100%
+			Wood: 0%
+			Light: 1%
+			Heavy: 0%
+			Concrete: 0%
+		InfDeath: 2
+
+Vulcan:
+	ROF: 30
+	Range: 5.75
+	Report: VULCAN
+	ValidTargets: Ground, Air
+	Projectile: Bullet
+		Speed: 100
+		ContrailLength: 3
+		TrailInterval: 1
+		ContrailDelay: 0
+		ContrailUsePlayerColor: true
+	Warhead:
+		Spread: 3
+		Versus: 
+			Wood: 0%
+			Light: 60%
+			Heavy: 10%
+			Concrete: 0%
+		Explosion: piffs
+		InfDeath: 2
+		Damage: 30
+
+Slung:
+	ROF: 60
+	Delay: 5
+	Range: 5.5
+	Report: BAZOOK2
+	ValidTargets: Ground
+	Projectile: Bullet
+		Speed: 25
+		High: true
+		Shadow: yes
+		Angle: .15
+		Proximity: true
+		Inaccuracy: 12
+		Image: DRAGON
+	Warhead:
+		Spread: 6
+		Versus: 
+			None: 0%
+			Wood: 75%
+			Light: 40%
+			Heavy: 90%
+			Concrete: 50%
+		Explosion: small_explosion
+		WaterExplosion: med_splash
+		InfDeath: 4
+		Damage: 30
+		ImpactSound: kaboom25
+
+M60mg:
+	ROF: 30
+	Range: 5
+	Burst: 2
+	BurstDelay: 5
+	Report: 20MMGUN1
+	Projectile: Bullet
+		Speed: 100
+		ContrailLength: 3
+		TrailInterval: 1
+		ContrailDelay: 0
+		ContrailUsePlayerColor: true
+	Warhead:
+		Spread: 3
+		Versus: 
+			Wood: 30%
+			Light: 45%
+			Heavy: 10%
+			Concrete: 20%
+		Explosion: piffs
+		InfDeath: 2
+		Damage: 30
+
+M60mgo:
+	ROF: 30
+	Range: 5
+	Burst: 2
+	BurstDelay: 5
+	Report: 20MMGUN1
+	Projectile: Bullet
+		Speed: 100
+		ContrailLength: 3
+		TrailInterval: 1
+		ContrailDelay: 0
+		ContrailUsePlayerColor: true
+	Warhead:
+		Spread: 3
+		Versus: 
+			Wood: 30%
+			Light: 45%
+			Heavy: 10%
+			Concrete: 20%
+		Explosion: piffs
+		InfDeath: 2
+		Damage: 40
+
 QuadRockets:
 	ROF: 60
 	Range: 6.5
@@ -135,25 +281,6 @@ TowerMissile:
 		SmudgeType: SandCrater, RockCrater
 		Damage: 50
 
-25mm:
-	ROF: 13
-	Range: 4
-	Report: MEDTANK1
-	Projectile: Bullet
-		Speed: 45
-		Image: 90MM
-	Warhead:
-		Spread: 3
-		Versus: 
-			None: 30%
-			Wood: 40%
-			Heavy: 40%
-			Concrete: 30%
-		Explosion: small_explosion
-		InfDeath: 4
-		SmudgeType: SandCrater, RockCrater
-		Damage: 16
-
 90mm:
 	ROF: 50
 	Range: 5.75
@@ -176,7 +303,7 @@ TowerMissile:
 
 90mma:
 	ROF: 50
-	Range: 6.5
+	Range: 7
 	Report: MEDTANK1
 	Projectile: Bullet
 		Speed: 55
@@ -194,27 +321,6 @@ TowerMissile:
 		SmudgeType: SandCrater, RockCrater
 		Damage: 40
 
-105mm:
-	ROF: 70
-	Range: 4.75
-	Report: MEDTANK1
-	Burst: 2
-	BurstDelay: 4
-	Projectile: Bullet
-		Speed: 45
-		Image: 90MM
-	Warhead:
-		Spread: 4
-		Versus: 
-			None: 20%
-			Wood: 75%
-			Light: 75%
-			Concrete: 50%
-		Explosion: small_explosion
-		InfDeath: 4
-		SmudgeType: SandCrater, RockCrater
-		Damage: 40
-
 120mm:
 	ROF: 70
 	Range: 6
@@ -358,52 +464,6 @@ ChainGun:
 		InfDeath: 2
 		Damage: 20
 
-M60mg:
-	ROF: 30
-	Range: 5
-	Burst: 2
-	BurstDelay: 5
-	Report: 20MMGUN1
-	Projectile: Bullet
-		Speed: 100
-		ContrailLength: 3
-		TrailInterval: 1
-		ContrailDelay: 0
-		ContrailUsePlayerColor: true
-	Warhead:
-		Spread: 3
-		Versus: 
-			Wood: 30%
-			Light: 45%
-			Heavy: 10%
-			Concrete: 20%
-		Explosion: piffs
-		InfDeath: 2
-		Damage: 30
-
-M60mgo:
-	ROF: 30
-	Range: 5
-	Burst: 2
-	BurstDelay: 5
-	Report: 20MMGUN1
-	Projectile: Bullet
-		Speed: 100
-		ContrailLength: 3
-		TrailInterval: 1
-		ContrailDelay: 0
-		ContrailUsePlayerColor: true
-	Warhead:
-		Spread: 3
-		Versus: 
-			Wood: 30%
-			Light: 45%
-			Heavy: 10%
-			Concrete: 20%
-		Explosion: piffs
-		InfDeath: 2
-		Damage: 40
-
 Heal:
 	ROF: 160
 	Range: 4
@@ -536,107 +596,6 @@ WormJaw:
 			Concrete: 0%
 		Damage: 100
 
-RedEye:
-	ROF: 50
-	Range: 8
-	Report: BAZOOK1
-	ValidTargets: Air
-	Projectile: Missile
-		Arm: 3
-		High: true
-		Shadow: true
-		Proximity: true
-#		Trail: smokey
-		ContrailLength: 10
-		Image: MISSILE
-		ROT: 20
-		RangeLimit: 30
-		Speed: 40
-	Warhead:
-		Spread: 3
-		Versus: 
-			None: 90%
-			Wood: 75%
-			Light: 60%
-			Heavy: 25%
-		Explosion: med_explosion
-		InfDeath: 3
-		SmudgeType: SandCrater, RockCrater
-		Damage: 60
-		ImpactSound: kaboom12
-
-Sniper:
-	ROF: 100
-	Range: 8.5
-	Report: RIFLE
-	Projectile: Bullet
-		Speed: 150
-		ContrailLength: 6
-		TrailInterval: 1
-		ContrailDelay: 0
-		ContrailUsePlayerColor: true
-	Warhead: 
-		Damage: 60
-		Spread: 1
-		Versus: 
-			None: 100%
-			Wood: 0%
-			Light: 1%
-			Heavy: 0%
-			Concrete: 0%
-		InfDeath: 2
-
-Vulcan:
-	ROF: 30
-	Range: 5.75
-	Report: VULCAN
-	ValidTargets: Ground, Air
-	Projectile: Bullet
-		Speed: 100
-		ContrailLength: 3
-		TrailInterval: 1
-		ContrailDelay: 0
-		ContrailUsePlayerColor: true
-	Warhead:
-		Spread: 3
-		Versus: 
-			Wood: 0%
-			Light: 60%
-			Heavy: 10%
-			Concrete: 0%
-		Explosion: piffs
-		InfDeath: 2
-		Damage: 30
-
-Slung:
-	ROF: 60
-	Delay: 5
-	Range: 5.5
-	Report: BAZOOK2
-	ValidTargets: Ground
-	Projectile: Bullet
-		Speed: 25
-		High: true
-		Shadow: yes
-		Angle: .15
-		Proximity: true
-		Inaccuracy: 12
-		Image: DRAGON
-	Warhead:
-		Spread: 6
-		Versus: 
-			None: 0%
-			Wood: 75%
-			Light: 40%
-			Heavy: 90%
-			Concrete: 50%
-		Explosion: small_explosion
-		WaterExplosion: med_splash
-		InfDeath: 4
-		Damage: 30
-		ImpactSound: kaboom25
-
-
 ParaBomb:
 	ROF: 10
 	Range: 4.5
@@ -672,4 +631,4 @@ Napalm:
 		Explosion: napalm
 		ImpactSound: NAPALM1
 		SmudgeType: Crater
-		Damage: 300
\ No newline at end of file
+		Damage: 300