diff --git a/mods/d2k/TODO b/mods/d2k/TODO
index 82b65b01a6..791a104cb2 100644
--- a/mods/d2k/TODO
+++ b/mods/d2k/TODO
@@ -22,4 +22,5 @@
 # put TilesetBuilder.Export into OpenRA.Utility to call the functions directly when extracting game-files (instead of opening a GUI)
 # group number metrics are off
 # building offsets wrong (worst for towers)
-# spice blooms should explode and create new spice field instead of growing spice
\ No newline at end of file
+# spice blooms should explode and create new spice field instead of growing spice
+# completely full spice silo looks like the empty one
\ No newline at end of file
diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml
index 3ccc97afdb..f233e05a4f 100644
--- a/mods/d2k/rules/aircraft.yaml
+++ b/mods/d2k/rules/aircraft.yaml
@@ -18,7 +18,7 @@
 	Helicopter:
 		InitialFacing: 0
 		ROT: 5
-		Speed: 14
+		Speed: 18
 		LandableTerrainTypes: Sand, Rock, Transition, Spice, Dune
 		RepairBuildings: repaira,repairo,repairh
 		RearmBuildings: starporta,starporto,starporth
@@ -87,7 +87,7 @@ ORNI:
 		LandWhenIdle: false
 		InitialFacing: 20
 		ROT: 4
-		Speed: 12
+		Speed: 20
 		RepairBuildings: repaira,repairo,repairh
 		RearmBuildings: starporta,starporto,starporth
 	RenderUnit:
@@ -110,7 +110,7 @@ ORNI.bomber:
 		Type: Light
 	Plane:
 		ROT: 5
-		Speed: 16
+		Speed: 25
 		RepairBuildings: repaira,repairo,repairh
 		RearmBuildings: starporta,starporto,starporth
 	LimitedAmmo:
@@ -139,7 +139,7 @@ CARRYALL.infantry:
 		Type: Light
 	Plane:
 		ROT: 5
-		Speed: 16
+		Speed: 25
 		RepairBuildings: repaira,repairo,repairh
 		RearmBuildings: starporta,starporto,starporth
 	RenderUnit:
diff --git a/mods/d2k/rules/ordos.yaml b/mods/d2k/rules/ordos.yaml
index cc7b34f06a..59e3a60699 100644
--- a/mods/d2k/rules/ordos.yaml
+++ b/mods/d2k/rules/ordos.yaml
@@ -196,8 +196,8 @@ RAIDER:
 	Armor:
 		Type: Light
 	Mobile:
-		ROT: 15
-		Speed: 20
+		ROT: 10
+		Speed: 15
 	RevealsShroud:
 		Range: 8
 	RenderUnit:
diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml
index 15255d4a73..38b8caec95 100644
--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -7,7 +7,7 @@
 	Health:
 		HP: 1000
 	Armor:
-		Type: Heavy
+		Type: Concrete
 	RevealsShroud:
 		Range: 5
 	Bib:
@@ -96,7 +96,7 @@
 	Health:
 		HP: 1500
 	Armor:
-		Type: Light
+		Type: Wood
 	RevealsShroud:
 		Range: 4
 	Bib:
@@ -126,7 +126,7 @@
 	Health:
 		HP: 1000
 	Armor:
-		Type: Light
+		Type: Wood
 	RevealsShroud:
 		Range: 4
 	Bib:
@@ -148,7 +148,7 @@
 	Health:
 		HP: 2000
 	Armor:
-		Type: Light
+		Type: Concrete
 	RevealsShroud:
 		Range: 4
 	Bib:
@@ -230,7 +230,7 @@
 	Health:
 		HP: 750
 	Armor:
-		Type: Light
+		Type: Wood
 	RevealsShroud:
 		Range: 4
 	Bib:
@@ -261,7 +261,7 @@
 	Health:
 		HP: 1500
 	Armor:
-		Type: Light
+		Type: Wood
 	RevealsShroud:
 		Range: 4
 	Bib:
@@ -317,6 +317,8 @@
 		Dimensions: 3,2
 	Health:
 		HP: 1000
+	Armor:
+		Type: Wood
 	RevealsShroud:
 		Range: 7
 	Bib:
@@ -358,7 +360,7 @@
 	Armor:
 		Type: Concrete
 	Wall:
-		CrushClasses: heavywall
+		CrushClasses: Concretewall
 	LineBuild:
 		Range: 8
 	SelectionDecorations:
@@ -393,7 +395,7 @@
 	Health:
 		HP: 400
 	Armor:
-		Type: Heavy
+		Type: Concrete
 	RevealsShroud:
 		Range: 7
 	RenderRangeCircle:
@@ -427,7 +429,7 @@
 	Health:
 		HP: 800
 	Armor: 
-		Type: Heavy
+		Type: Concrete
 	RevealsShroud:
 		Range: 8
 	-RenderBuilding:
@@ -483,7 +485,7 @@ SIETCH:
 	Health:
 		HP: 400
 	Armor:
-		Type: Heavy
+		Type: Concrete
 	RevealsShroud:
 		Range: 10
 	-GivesBuildableArea:
diff --git a/mods/d2k/rules/system.yaml b/mods/d2k/rules/system.yaml
index 7ee0130fd7..1aee1937c0 100644
--- a/mods/d2k/rules/system.yaml
+++ b/mods/d2k/rules/system.yaml
@@ -93,7 +93,7 @@ Player:
 	BaseAttackNotifier:
 	HarvesterAttackNotifier:
 
-World:	
+World:
 	OpenWidgetAtGameStart:
 		Widget: INGAME_ROOT
 		ObserverWidget: OBSERVER_ROOT
diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml
index fa36df6fd7..616a28fc3a 100644
--- a/mods/d2k/rules/vehicles.yaml
+++ b/mods/d2k/rules/vehicles.yaml
@@ -79,8 +79,8 @@
 	Armor:
 		Type: Light
 	Mobile:
-		ROT: 15
-		Speed: 20
+		ROT: 10
+		Speed: 12
 	RevealsShroud:
 		Range: 8
 	RenderUnit:
@@ -111,7 +111,7 @@
 		Type: Light
 	Mobile:
 		ROT: 10
-		Speed: 13
+		Speed: 12
 	RevealsShroud:
 		Range: 7
 	RenderUnit: