diff --git a/mods/d2k/TODO b/mods/d2k/TODO
index 78c48e3173..2d6a30a079 100644
--- a/mods/d2k/TODO
+++ b/mods/d2k/TODO
@@ -8,11 +8,10 @@
 # chimney animation (refinery) missing
 # create a tileset extractor for gamefiles to remove copyrighted content from distribution
 # replace ore with spice and mines with spice blooms
-# add Smudge Types
+# add Smudge Types (stored in SHPs not in tileset)
 # add game logic for concrete plates (use terrain overlay from bridges/ressources)
 # allow placing turrets on walls
 # support separate turret sequence with RenderBuildingTurreted
-# repair bay should really repair vehicles
 # ornithocopter should flap (might need new RenderOrni code for proper animation)
 # R8 converter needs infantry frame resorter
 # add infantry dieing animation
@@ -25,12 +24,17 @@
 # add thumper which really attracts sandworms
 # allow upgrades
 # add voices (Dune 2000/DATA/SFX folder contains .aud files)
-# muzzles and explosions with lightning (might need engine update)
+# add SOUND.TS .wav file extractor to RA.Utility.exe
+# convert .wav to .aud or support .wav files for Dune 2000 sounds
+# add muzzles and explosions with lightning (might need engine update)
 # ingame gamefile extractor at first start when SHPs are not found
-# create a shellmap
+# create a shellmap (currently just a blank placeholder)
 # rework chrome UI, dialoges, tabs
 # add install rules to makefile (once more polished)
-# idea: frame 2998 (fremen siech) could become a tunnel to make Ordos really insidious (similiar mechanism to paratroopers powerproxy)
 # add sonic tank weapon (currently uses tesla)
 # make deviator change the allegiance of ememy units (currently shoots rockets)
-# replace RA mouse.shp, nopower.shp with Dune 2000 equivalent
\ No newline at end of file
+# replace RA mouse.shp, nopower.shp with Dune 2000 equivalent
+# add bots (blocked by issue #2184)
+# complete Arrakis tileset (blocked by issue #2178)
+# allow frigate to deliver 5 units at once to starport
+# starport prices should vary
\ No newline at end of file
diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml
index 2d51ce9751..3e31d5d373 100644
--- a/mods/d2k/rules/aircraft.yaml
+++ b/mods/d2k/rules/aircraft.yaml
@@ -18,7 +18,6 @@ CARRYALL:
 	RevealsShroud:
 		Range: 12
 	Helicopter:
-		RearmBuildings: hightecha
 		InitialFacing: 0
 		ROT: 5
 		Speed: 15
@@ -63,7 +62,7 @@ ORNI:
 	Buildable:
 		Queue: Plane
 		BuildPaletteOrder: 90
-		Prerequisites: hightecha
+		Prerequisites: researcha
 		BuiltAt: hightecha
 		Owner: atreides
 	Valued:
diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml
index b08419a8f3..b9a5a7e09a 100644
--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -14,7 +14,6 @@
 		Voice: VehicleVoice
 	TargetableUnit:
 		TargetTypes: Ground
-	Repairable: 
 	Passenger: 
 		CargoType: Vehicle
 	AttackMove:
@@ -28,6 +27,8 @@
 		Types:Vehicle
 	GivesBounty:
 	WithSmoke:
+	Repairable:
+		RepairBuildings: repaira,repairh,repairo
 
 ^Tank:
 	AppearsOnRadar:
@@ -45,7 +46,6 @@
 		Voice: VehicleVoice
 	TargetableUnit:
 		TargetTypes: Ground
-	Repairable: 
 	Passenger: 
 		CargoType: Vehicle
 	AttackMove:
@@ -59,6 +59,8 @@
 		Types:Tank
 	GivesBounty:
 	WithSmoke:
+	Repairable:
+		RepairBuildings: repaira,repairh,repairo
 
 ^Infantry:
 	AppearsOnRadar:
diff --git a/mods/d2k/rules/system.yaml b/mods/d2k/rules/system.yaml
index df548ed7b8..2b3d8889d8 100644
--- a/mods/d2k/rules/system.yaml
+++ b/mods/d2k/rules/system.yaml
@@ -41,26 +41,38 @@ Player:
 #		BuildingFractions:
 #			refa: 30%
 #			refh: 30%
+#			refo: 30%
 #			powra: 35%
 #			powrh: 35%
+#			powro: 35%
 #			barra: 1%
 #			barrh: 1%
+#			barro: 1%
 #			lighta: 1%
 #			lighth: 1%
+#			lighto: 1%
 #			heavya: 1%
 #			heavyh: 1%
+#			heavyo: 1%
 #			researcha: 1%
 #			researchh: 1%
+#			researcho: 1%
 #			repaira: 0.1%
+#			repairh: 0.1%
+#			repairo: 0.1%
 #			radara: 10%
+#			radaro: 10%
+#			radarh: 10%
 #		UnitsToBuild:
 #			trike: 30%
+#			raider: 30%
 #			quad: 40%
 #			siege: 15%
 #			combata: 70%
 #			combath: 70%
 #			sonic: 25%
 #			devast: 25%
+#			deviator: 25%
 #		SquadSize: 10
 	PlayerColorPalette:
 		BasePalette: d2k
@@ -213,10 +225,11 @@ CRATE:
 	RevealMapCrateAction:
 		SelectionShares: 1
 		Effect: reveal-map
+#TODO: Currently only gives you an Atreides MCV
 	GiveMcvCrateAction:
 		SelectionShares: 2
 		NoBaseSelectionShares: 9001
-		Unit: mcv
+		Unit: mcva
 	GiveUnitCrateAction@trike:
 		SelectionShares: 7
 		Unit: trike