diff --git a/248k_2/prototypes/el_recipes.lua b/248k_2/prototypes/el_recipes.lua
index 22074be..345f1bc 100644
--- a/248k_2/prototypes/el_recipes.lua
+++ b/248k_2/prototypes/el_recipes.lua
@@ -13,13 +13,12 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'el_aluminum_item',30},
-            {'concrete',20},
-            {'electronic-circuit',40},
-            {'copper-plate',20},
+            {type="item", name="el_aluminum_item", amount=30},
+            {type="item", name="concrete", amount=20},
+            {type="item", name="electronic-circuit", amount=40},
+            {type="item", name="copper-plate", amount=20},
         },
-        result = 'el_solar_item',
-        result_count = 2,
+        results = {{type="item", name='el_solar_item', amount=2}},
         energy_required = 4,
         order = 'a-a-2',
     },
@@ -33,12 +32,11 @@ data:extend({
         category = 'crafting',
         subgroup = 'el_item_subgroup_b',
         ingredients = {
-            {'el_lithium_item',4},
-            {'iron-plate',4},
-            {'copper-plate',4},
+            {type="item", name="el_lithium_item", amount=4},
+            {type="item", name="iron-plate", amount=4},
+            {type="item", name="copper-plate", amount=4},
         },
-        result = 'battery',
-        result_count = 12,
+        results = {{type="item", name='battery', amount=12}},
         energy_required = 20,
         order = 'b-a',
     },
@@ -49,12 +47,11 @@ data:extend({
         enabled = false,
         category = 'crafting',
         ingredients = {
-            {'el_lithium_item',4},
-            {'iron-plate',4},
-            {'steel-plate',4},
+            {type="item", name="el_lithium_item", amount=4},
+            {type="item", name="iron-plate", amount=4},
+            {type="item", name="steel-plate", amount=4},
         },
-        result = 'el_lithium_battery',
-        result_count = 2,
+        results = {{type="item", name='el_lithium_battery', amount=2}},
         energy_required = 10,
     },
     --el_burner
@@ -64,13 +61,12 @@ data:extend({
         enabled = false,
         category = 'crafting',
         ingredients = {
-            {'iron-gear-wheel',40},
-            {'steel-plate',15},
-            {'el_materials_ALK',10},
-            {'electronic-circuit',10}
+            {type="item", name="iron-gear-wheel", amount=40},
+            {type="item", name="steel-plate", amount=15},
+            {type="item", name="el_materials_ALK", amount=10},
+            {type="item", name="electronic-circuit", amount=10}
         },
-        result = 'el_burner_item',
-        result_count = 1,
+        results = {{type="item", name='el_burner_item', amount=1}},
         energy_required = 4,
     },
     {
@@ -79,12 +75,11 @@ data:extend({
         enabled = false,
         category = 'crafting',
         ingredients = {
-            {'el_burner_item',1},
-            {'pipe',20},
-            {'electronic-circuit',20},
+            {type="item", name="el_burner_item", amount=1},
+            {type="item", name="pipe", amount=20},
+            {type="item", name="electronic-circuit", amount=20},
         },
-        result = 'el_burner_kerosene_item',
-        result_count = 1,
+        results = {{type="item", name='el_burner_kerosene_item', amount=1}},
         energy_required = 4,
     },
     --el_water_generator
@@ -94,15 +89,14 @@ data:extend({
         enabled = false,
         category = 'crafting',
         ingredients = {
-            {'iron-gear-wheel',60},
-            {'engine-unit',15},
-            {'el_materials_ALK',20},
-            {'electronic-circuit',20},
-            {'pipe',30},
-            {'copper-cable',20},
+            {type="item", name="iron-gear-wheel", amount=60},
+            {type="item", name="engine-unit", amount=15},
+            {type="item", name="el_materials_ALK", amount=20},
+            {type="item", name="electronic-circuit", amount=20},
+            {type="item", name="pipe", amount=30},
+            {type="item", name="copper-cable", amount=20},
         },
-        result = 'el_water_generator_item',
-        result_count = 2,
+        results = {{type="item", name='el_water_generator_item', amount=2}},
         energy_required = 4,
     },
     --el_pressurizer
@@ -112,13 +106,12 @@ data:extend({
         enabled = false,
         category = 'crafting',
         ingredients = {
-            {'iron-gear-wheel',20},
-            {'pipe',15},
-            {'el_materials_ALK',10},
-            {'electronic-circuit',10}
+            {type="item", name="iron-gear-wheel", amount=20},
+            {type="item", name="pipe", amount=15},
+            {type="item", name="el_materials_ALK", amount=10},
+            {type="item", name="electronic-circuit", amount=10}
         },
-        result = 'el_pressurizer_item',
-        result_count = 1,
+        results = {{type="item", name='el_pressurizer_item', amount=1}},
         energy_required = 4,
     },
     --el_water_pressure
@@ -147,14 +140,13 @@ data:extend({
         enabled = false,
         category = 'crafting',
         ingredients = {
-            {'locomotive',1},
-            {'engine-unit',15},
-            {'iron-gear-wheel',40},
-            {'advanced-circuit',15},
-            {'el_materials_ALK',25}, 
+            {type="item", name="locomotive", amount=1},
+            {type="item", name="engine-unit", amount=15},
+            {type="item", name="iron-gear-wheel", amount=40},
+            {type="item", name="advanced-circuit", amount=15},
+            {type="item", name="el_materials_ALK", amount=25},
         },
-        result = 'el_diesel_train_item',
-        result_count = 1,
+        results = {{type="item", name='el_diesel_train_item', amount=1}},
         energy_required = 20,
     },
     --el_kerosene
@@ -173,7 +165,6 @@ data:extend({
             {type="fluid", name="light-oil", amount=90},
             {type="fluid", name="water", amount=70},
         },
-        result_count = 1,
         energy_required = 5,
         icon_size = 64,
         icons = {
@@ -191,12 +182,11 @@ data:extend({
         enabled = false,
         category = 'crafting',
         ingredients = {
-            {'storage-tank', 4},
-            {'steel-plate', 50},
-            {'el_aluminum_item', 150},
+            {type="item", name="storage-tank", amount=4},
+            {type="item", name="steel-plate", amount=50},
+            {type="item", name="el_aluminum_item", amount=150},
         },
-        result = 'el_tank_item',
-        result_count = 1,
+        results = {{type="item", name='el_tank_item', amount=1}},
         energy_required = 4,
     },
     --el_desulfurized_kerosene
@@ -213,7 +203,6 @@ data:extend({
             {type="fluid", name="el_desulfurized_kerosene", amount=80},
             {type="fluid", name="el_acidic_water", amount=120},
         },
-        result_count = 1,
         energy_required = 4,
     },
     --el_usage_acidic_water
@@ -232,7 +221,6 @@ data:extend({
             {type="fluid", name="sulfuric-acid", amount=100},
             --{type="item", name="sulfur", amount=6},
         },
-        result_count = 1,
         energy_required = 4,
     },
     --el_train_fuel_diesel
@@ -249,7 +237,6 @@ data:extend({
         results = {
             {type="item", name="el_train_fuel_diesel_item", amount=1},
         },
-        result_count = 1,
         energy_required = 10,
     },
     --el_generator_equip
@@ -267,7 +254,6 @@ data:extend({
         results = {
             {type="item", name="el_train_equipment_generator_item", amount=1},
         },
-        result_count = 1,
         energy_required = 25,
     },
     --el_accelerator_equip
@@ -285,7 +271,6 @@ data:extend({
         results = {
             {type="item", name="el_train_equipment_accelerator_item", amount=1},
         },
-        result_count = 1,
         energy_required = 25,
     },
     --el_energy_crystal
@@ -301,7 +286,6 @@ data:extend({
         results = {
             {type="item", name="el_energy_crystal_item", amount=2},
         },
-        result_count = 1,
         energy_required = 10,
         always_show_made_in = true
     },
@@ -318,7 +302,6 @@ data:extend({
         results = {
             {type="item", name="el_train_fuel_diesel_energized_item", amount=4},
         },
-        result_count = 1,
         energy_required = 5,
     },
     --el_ki_beacon
@@ -335,7 +318,6 @@ data:extend({
         results = {
             {type="item", name="el_ki_beacon_item", amount=1},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
@@ -352,7 +334,6 @@ data:extend({
         results = {
             {type="item", name="fi_ki_beacon_item", amount=1},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
@@ -369,7 +350,6 @@ data:extend({
         results = {
             {type="item", name="fu_ki_beacon_item", amount=1},
         },
-        result_count = 1,
         energy_required = 6,
     },
     --el_ki_core
@@ -393,7 +373,6 @@ data:extend({
         results = {
             {type="item", name="el_ki_core_item", amount=1},
         },
-        result_count = 1,
         energy_required = 60,
     },
     {
@@ -414,7 +393,6 @@ data:extend({
         results = {
             {type="item", name="fi_ki_core_item", amount=1},
         },
-        result_count = 1,
         energy_required = 60,
     },
     {
@@ -438,7 +416,6 @@ data:extend({
         results = {
             {type="item", name="fu_ki_core_item", amount=1},
         },
-        result_count = 1,
         energy_required = 60,
     },
     --el_ki_memory_entity
@@ -456,7 +433,6 @@ data:extend({
         results = {
             {type="item", name="el_ki_memory_item", amount=1},
         },
-        result_count = 1,
         energy_required = 30,
     },
     {
@@ -473,7 +449,6 @@ data:extend({
         results = {
             {type="item", name="fi_ki_circuit_item", amount=1},
         },
-        result_count = 1,
         energy_required = 30,
     },
     {
@@ -492,7 +467,6 @@ data:extend({
         results = {
             {type="item", name="fu_ki_circuit_item", amount=1},
         },
-        result_count = 1,
         energy_required = 30,
     },
     --el_ki_memory_fluid
@@ -809,8 +783,7 @@ data:extend({
         results = {
             {type="item", name="el_ki_cpu_item", amount=1},
         },
-        result_count = 1,
-        energy_required = 30, 
+        energy_required = 30,
     },
     --el_ki_cpu_fluid
     {
@@ -972,12 +945,11 @@ data:extend({
         enabled = false,
         category = 'crafting',
         ingredients = {
-            {'iron-gear-wheel',40},
-            {'steel-plate',25},
-            {'stone-furnace',2}
+            {type="item", name="iron-gear-wheel", amount=40},
+            {type="item", name="steel-plate", amount=25},
+            {type="item", name="stone-furnace", amount=2}
         },
-        result = 'el_arc_furnace_item',
-        result_count = 1,
+        results = {{type="item", name='el_arc_furnace_item', amount=1}},
         energy_required = 4,
     },
     {
@@ -986,12 +958,11 @@ data:extend({
         enabled = false,
         category = 'crafting',
         ingredients = {
-            {'iron-gear-wheel',40},
-            {'steel-plate',25},
-            {'electronic-circuit',20}
+            {type="item", name="iron-gear-wheel", amount=40},
+            {type="item", name="steel-plate", amount=25},
+            {type="item", name="electronic-circuit", amount=20}
         },
-        result = 'el_caster_item',
-        result_count = 1,
+        results = {{type="item", name='el_caster_item', amount=1}},
         energy_required = 4,
     },
     {
@@ -1000,12 +971,11 @@ data:extend({
         enabled = false,
         category = 'crafting',
         ingredients = {
-            {'iron-gear-wheel',40},
-            {'steel-plate',15},
-            {'electronic-circuit',10}
+            {type="item", name="iron-gear-wheel", amount=40},
+            {type="item", name="steel-plate", amount=15},
+            {type="item", name="electronic-circuit", amount=10}
         },
-        result = 'el_purifier_item',
-        result_count = 1,
+        results = {{type="item", name='el_purifier_item', amount=1}},
         energy_required = 4,
     },
     {
@@ -1014,13 +984,12 @@ data:extend({
         enabled = false,
         category = 'crafting',
         ingredients = {
-            {'iron-gear-wheel',40},
-            {'steel-plate',15},
-            {'el_materials_ALK',15},
-            {'electronic-circuit',10}
+            {type="item", name="iron-gear-wheel", amount=40},
+            {type="item", name="steel-plate", amount=15},
+            {type="item", name="el_materials_ALK", amount=15},
+            {type="item", name="electronic-circuit", amount=10}
         },
-        result = 'el_grower_item',
-        result_count = 1,
+        results = {{type="item", name='el_grower_item', amount=1}},
         energy_required = 4,
     },
 
@@ -1186,10 +1155,9 @@ data:extend({
         enabled = false,
         category = 'smelting',
         ingredients = {
-            {'el_aluminum_ore_item',2},
+            {type="item", name="el_aluminum_ore_item", amount=2},
         },
-        result = 'el_aluminum_item',
-        result_count = 4,
+        results = {{type="item", name='el_aluminum_item', amount=4}},
         energy_required = 2,
         always_show_made_in = true,
         order = 'a-c',
@@ -1423,7 +1391,6 @@ data:extend({
             {type="fluid", name="el_kerosene", amount=140},
             {type="fluid", name="water", amount=90},
         },
-        result_count = 1,
         energy_required = 5,
         icon_size = 64,
         icons = {
@@ -1441,12 +1408,11 @@ data:extend({
         enabled = false,
         category = 'crafting',
         ingredients = {
-            {'iron-gear-wheel',40},
-            {'steel-plate',25},
-            {'stone-furnace',2}
+            {type="item", name="iron-gear-wheel", amount=40},
+            {type="item", name="steel-plate", amount=25},
+            {type="item", name="stone-furnace", amount=2}
         },
-        result = 'el_charger_item',
-        result_count = 1,
+        results = {{type="item", name='el_charger_item', amount=1}},
         energy_required = 4,
     },
     {
@@ -1457,8 +1423,7 @@ data:extend({
         ingredients = {
             {type='item', name='el_energy_crystal_item', amount=1},
         },
-        result = 'el_energy_crystal_charged_item',
-        result_count = 1,
+        results = {{type="item", name='el_energy_crystal_charged_item', amount=1}},
         energy_required = 2,
         always_show_made_in = true,
     },
@@ -1475,7 +1440,6 @@ data:extend({
         results = {
             {type="item", name="el_grenade", amount=1},
         },
-        result_count = 1,
         energy_required = 4,
     },
 
diff --git a/248k_2/prototypes/fi_recipes.lua b/248k_2/prototypes/fi_recipes.lua
index 0ba915b..ff918cf 100644
--- a/248k_2/prototypes/fi_recipes.lua
+++ b/248k_2/prototypes/fi_recipes.lua
@@ -14,14 +14,13 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'concrete',30},
-            {'fi_materials_GFK',20},
-            {'iron-gear-wheel',20},
-            {'electronic-circuit',15},
-            {'el_energy_crystal_item',4},
+            {type="item", name="concrete", amount=30},
+            {type="item", name="fi_materials_GFK", amount=20},
+            {type="item", name="iron-gear-wheel", amount=20},
+            {type="item", name="electronic-circuit", amount=15},
+            {type="item", name="el_energy_crystal_item", amount=4},
         },
-        result = 'fi_crafter_item',
-        result_count = 1,
+        results = {{type="item", name='fi_crafter_item', amount=1}},
         energy_required = 4,
     },
     {
@@ -29,12 +28,11 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'concrete',50},
-            {'fi_materials_GFK',40},
-            {'el_tank_item',1}
+            {type="item", name="concrete", amount=50},
+            {type="item", name="fi_materials_GFK", amount=40},
+            {type="item", name="el_tank_item", amount=1}
         },
-        result = 'fi_castor_item',
-        result_count = 1,
+        results = {{type="item", name='fi_castor_item', amount=1}},
         energy_required = 4,
     },
     --crusher
@@ -43,14 +41,13 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'concrete',60},
-            {'el_materials_ALK',20},
-            {'iron-gear-wheel',40},
-            {'engine-unit',15},
-            {'el_energy_crystal_item',10},
+            {type="item", name="concrete", amount=60},
+            {type="item", name="el_materials_ALK", amount=20},
+            {type="item", name="iron-gear-wheel", amount=40},
+            {type="item", name="engine-unit", amount=15},
+            {type="item", name="el_energy_crystal_item", amount=10},
         },
-        result = 'fi_crusher_item',
-        result_count = 1,
+        results = {{type="item", name='fi_crusher_item', amount=1}},
         energy_required = 4,
     },
     --miner
@@ -59,14 +56,13 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'concrete',100},
-            {'fi_compound_material_item',60},
-            {'iron-gear-wheel',40},
-            {'electric-mining-drill',8},
-            {'engine-unit',10},
+            {type="item", name="concrete", amount=100},
+            {type="item", name="fi_compound_material_item", amount=60},
+            {type="item", name="iron-gear-wheel", amount=40},
+            {type="item", name="electric-mining-drill", amount=8},
+            {type="item", name="engine-unit", amount=10},
         },
-        result = 'fi_miner_item',
-        result_count = 1,
+        results = {{type="item", name='fi_miner_item', amount=1}},
         energy_required = 4,
     },
     --fuels
@@ -75,12 +71,11 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'uranium-235',1},
-            {'uranium-238',19},
-            {'el_materials_ALK',10},
+            {type="item", name="uranium-235", amount=1},
+            {type="item", name="uranium-238", amount=19},
+            {type="item", name="el_materials_ALK", amount=10},
         },
-        result = 'fi_basic_fuel_item',
-        result_count = 8,
+        results = {{type="item", name='fi_basic_fuel_item', amount=8}},
         energy_required = 20,
     },
     {
@@ -88,12 +83,11 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'fi_thorium232_item',10},
-            {'uranium-238',10},
-            {'el_materials_ALK',10},
+            {type="item", name="fi_thorium232_item", amount=10},
+            {type="item", name="uranium-238", amount=10},
+            {type="item", name="el_materials_ALK", amount=10},
         },
-        result = 'fi_basic_thorium_fuel_item',
-        result_count = 8,
+        results = {{type="item", name='fi_basic_thorium_fuel_item', amount=8}},
         energy_required = 20,
     },
     {
@@ -101,12 +95,11 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'fi_plutonium239_item',1},
-            {'uranium-238',19},
-            {'el_materials_ALK',10},
+            {type="item", name="fi_plutonium239_item", amount=1},
+            {type="item", name="uranium-238", amount=19},
+            {type="item", name="el_materials_ALK", amount=10},
         },
-        result = 'fi_advanced_fuel_item',
-        result_count = 2,
+        results = {{type="item", name='fi_advanced_fuel_item', amount=2}},
         energy_required = 20,
     },
     {
@@ -114,12 +107,11 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'fi_uranium233_item',4},
-            {'uranium-238',16},
-            {'el_materials_ALK',10},
+            {type="item", name="fi_uranium233_item", amount=4},
+            {type="item", name="uranium-238", amount=16},
+            {type="item", name="el_materials_ALK", amount=10},
         },
-        result = 'fi_advanced_thorium_fuel_item',
-        result_count = 2,
+        results = {{type="item", name='fi_advanced_thorium_fuel_item', amount=2}},
         energy_required = 20,
     },
     {
@@ -127,12 +119,11 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'uranium-235',1},
-            {'fi_plutonium239_item',1},
-            {'el_materials_ALK',10},
+            {type="item", name="uranium-235", amount=1},
+            {type="item", name="fi_plutonium239_item", amount=1},
+            {type="item", name="el_materials_ALK", amount=10},
         },
-        result = 'fi_pure_fuel_item',
-        result_count = 1,
+        results = {{type="item", name='fi_pure_fuel_item', amount=1}},
         energy_required = 20,
     },
     --reactor
@@ -141,15 +132,14 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'steel-plate',450},
-            {'concrete',400},
-            {'fi_materials_GFK',300},
-            {'fi_materials_NFK',300},
-            {'fi_energy_crystal_item',40},
-            {'advanced-circuit',500},
+            {type="item", name="steel-plate", amount=450},
+            {type="item", name="concrete", amount=400},
+            {type="item", name="fi_materials_GFK", amount=300},
+            {type="item", name="fi_materials_NFK", amount=300},
+            {type="item", name="fi_energy_crystal_item", amount=40},
+            {type="item", name="advanced-circuit", amount=500},
         },
-        result = 'fi_solid_reactor_item',
-        result_count = 1,
+        results = {{type="item", name='fi_solid_reactor_item', amount=1}},
         energy_required = 20,
     },
     --material
@@ -158,12 +148,11 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'el_aluminum_item',15},
-            {'steel-plate',10},
-            {'iron-plate',20},
+            {type="item", name="el_aluminum_item", amount=15},
+            {type="item", name="steel-plate", amount=10},
+            {type="item", name="iron-plate", amount=20},
         },
-        result = 'fi_compound_material_item',
-        result_count = 2,
+        results = {{type="item", name='fi_compound_material_item', amount=2}},
         energy_required = 4,
     },
     {
@@ -173,12 +162,11 @@ data:extend({
         category = 'fi_crafting_category',
         subgroup = 'fi_item_subgroup_b',
         ingredients = {
-            {'fi_materials_glass_fiber',3},
-            {'el_materials_ALK',3},
-            {'copper-plate',30},
+            {type="item", name="fi_materials_glass_fiber", amount=3},
+            {type="item", name="el_materials_ALK", amount=3},
+            {type="item", name="copper-plate", amount=30},
         },
-        result = 'low-density-structure',
-        result_count = 4,
+        results = {{type="item", name='low-density-structure', amount=4}},
         energy_required = 20,
         order = 'b-b',
         always_show_made_in = true,
@@ -192,15 +180,14 @@ data:extend({
         category = 'centrifuging',
         main_product = 'fi_plutonium239_item',
         ingredients = {
-            {'fi_used_basic_fuel_item',6},
+            {type="item", name="fi_used_basic_fuel_item", amount=6},
             {type="item", name="fi_materials_solution", amount=1},
         },
         results = {
-            {'fi_plutonium239_item',1},
-            {'fi_materials_waste',1},
+            {type="item", name="fi_plutonium239_item", amount=1},
+            {type="item", name="fi_materials_waste", amount=1},
             {type="item", name="fi_materials_empty_solution", amount=1, probability=0.95},
         },
-        result_count = 1,
         energy_required = 20,
     },
     {
@@ -210,15 +197,14 @@ data:extend({
         category = 'crafting-with-fluid',
         main_product = 'fi_thorium232_item',
         ingredients = {
-            {'stone',80},
-            {'el_energy_crystal_item',2},
+            {type="item", name="stone", amount=80},
+            {type="item", name="el_energy_crystal_item", amount=2},
             {type="fluid", name="sulfuric-acid", amount=140},
         },
         results = {
-            {'fi_thorium232_item',2},
-            {'uranium-238',3}
+            {type="item", name="fi_thorium232_item", amount=2},
+            {type="item", name="uranium-238", amount=3}
         },
-        result_count = 1,
         energy_required = 40,
     },
     {
@@ -228,15 +214,14 @@ data:extend({
         category = 'centrifuging',
         main_product = 'fi_uranium233_item',
         ingredients = {
-            {'fi_used_basic_thorium_fuel_item',6},
+            {type="item", name="fi_used_basic_thorium_fuel_item", amount=6},
             {type="item", name="fi_materials_solution", amount=1},
         },
         results = {
-            {'fi_uranium233_item',1},
-            {'fi_materials_waste',1},
+            {type="item", name="fi_uranium233_item", amount=1},
+            {type="item", name="fi_materials_waste", amount=1},
             {type="item", name="fi_materials_empty_solution", amount=1, probability=0.95},
         },
-        result_count = 1,
         energy_required = 20,
     },
     {
@@ -244,12 +229,11 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'explosive-rocket',10},
-            {'fi_plutonium239_item',10},
-            {'rocket-control-unit',10}
+            {type="item", name="explosive-rocket", amount=10},
+            {type="item", name="fi_plutonium239_item", amount=10},
+            {type="item", name="rocket-control-unit", amount=10}
         },
-        result = 'atomic-bomb',
-        result_count = 1,
+        results = {{type="item", name='atomic-bomb', amount=1}},
         energy_required = 20,
     },
     --wideraufbereitung
@@ -260,15 +244,14 @@ data:extend({
         main_product = 'uranium-238',
         category = 'centrifuging',
         ingredients = {
-            {'fi_used_advanced_fuel_item',4},
+            {type="item", name="fi_used_advanced_fuel_item", amount=4},
             {type="item", name="fi_materials_solution", amount=1},
         },
         results = {
-            {'uranium-238',1},
-            {'fi_materials_waste',1},
+            {type="item", name="uranium-238", amount=1},
+            {type="item", name="fi_materials_waste", amount=1},
             {type="item", name="fi_materials_empty_solution", amount=1, probability=0.95},
         },
-        result_count = 3,
         energy_required = 20,
         subgroup = 'fi_item_subgroup_a',
         order = 'a-d',
@@ -281,15 +264,14 @@ data:extend({
         category = 'centrifuging',
         main_product = 'uranium-238',
         ingredients = {
-            {'fi_used_advanced_thorium_fuel_item',4},
+            {type="item", name="fi_used_advanced_thorium_fuel_item", amount=4},
             {type="item", name="fi_materials_solution", amount=1},
         },
         results = {
-            {'uranium-238',1},
-            {'fi_materials_waste',1},
+            {type="item", name="uranium-238", amount=1},
+            {type="item", name="fi_materials_waste", amount=1},
             {type="item", name="fi_materials_empty_solution", amount=1, probability=0.95},
         },
-        result_count = 3,
         energy_required = 20,
         subgroup = 'fi_item_subgroup_a',
         order = 'a-e',
@@ -302,15 +284,14 @@ data:extend({
         category = 'centrifuging',
         main_product = 'uranium-238',
         ingredients = {
-            {'fi_used_pure_fuel_item',4},
+            {type="item", name="fi_used_pure_fuel_item", amount=4},
             {type="item", name="fi_materials_solution", amount=1},
         },
         results = {
-            {'uranium-238',1},
-            {'fi_materials_waste',1},
+            {type="item", name="uranium-238", amount=1},
+            {type="item", name="fi_materials_waste", amount=1},
             {type="item", name="fi_materials_empty_solution", amount=1, probability=0.95},
         },
-        result_count = 3,
         energy_required = 20,
         subgroup = 'fi_item_subgroup_a',
         order = 'a-f',
@@ -322,11 +303,10 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'fi_solid_reactor_item',1},
-            {'fi_pure_fuel_item',1},
+            {type="item", name="fi_solid_reactor_item", amount=1},
+            {type="item", name="fi_pure_fuel_item", amount=1},
         },
-        result = 'fi_equipment_player_reactor_item',
-        result_count = 6,
+        results = {{type="item", name='fi_equipment_player_reactor_item', amount=6}},
         energy_required = 20,
     },
     {
@@ -334,13 +314,12 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'fi_energy_crystal_item',20},
-            {'low-density-structure',10},
-            {'processing-unit',10},
-            {'energy-shield-mk2-equipment',5}
+            {type="item", name="fi_energy_crystal_item", amount=20},
+            {type="item", name="low-density-structure", amount=10},
+            {type="item", name="processing-unit", amount=10},
+            {type="item", name="energy-shield-mk2-equipment", amount=5}
         },
-        result = 'fi_equipment_player_shield_item',
-        result_count = 1,
+        results = {{type="item", name='fi_equipment_player_shield_item', amount=1}},
         energy_required = 20,
     },
     {
@@ -348,13 +327,12 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'fi_solid_reactor_item',1},
-            {'low-density-structure',10},
-            {'iron-gear-wheel',20},
-            {'fi_pure_fuel_item',1},
+            {type="item", name="fi_solid_reactor_item", amount=1},
+            {type="item", name="low-density-structure", amount=10},
+            {type="item", name="iron-gear-wheel", amount=20},
+            {type="item", name="fi_pure_fuel_item", amount=1},
         },
-        result = 'fi_train_equipment_generator_item',
-        result_count = 6,
+        results = {{type="item", name='fi_train_equipment_generator_item', amount=6}},
         energy_required = 20,
     },
     --crystals
@@ -367,8 +345,7 @@ data:extend({
             {type="item", name="el_energy_crystal_item", amount=1},
             {type="fluid", name="fi_crystal_fluid", amount=50},
         },
-        result = 'fi_energy_crystal_item',
-        result_count = 2,
+        results = {{type="item", name='fi_energy_crystal_item', amount=2}},
         energy_required = 4,
         always_show_made_in = true,
     },
@@ -378,10 +355,9 @@ data:extend({
         enabled = false,
         category = 'centrifuging',
         ingredients = {
-            {'el_train_fuel_diesel_energized_item',1},
+            {type="item", name="el_train_fuel_diesel_energized_item", amount=1},
         },
-        result = 'fi_catalyst_crystal_item',
-        result_count = 2,
+        results = {{type="item", name='fi_catalyst_crystal_item', amount=2}},
         energy_required = 2,
         always_show_made_in = true,
     },
@@ -394,8 +370,7 @@ data:extend({
             {type="fluid", name="fi_crystal_fluid", amount=100},
             {type="item", name="fi_catalyst_crystal_item", amount=1},
         },
-        result = 'fi_base_crystal_item',
-        result_count = 2,
+        results = {{type="item", name='fi_base_crystal_item', amount=2}},
         energy_required = 6,
     },
     {
@@ -404,10 +379,9 @@ data:extend({
         enabled = false,
         category = 'fi_crushing',
         ingredients = {
-            {'el_energy_crystal_item',1},
+            {type="item", name="el_energy_crystal_item", amount=1},
         },
-        result = 'fi_crushed_crystal_item',
-        result_count = 2,
+        results = {{type="item", name='fi_crushed_crystal_item', amount=2}},
         energy_required = 2,
         always_show_made_in = true,
     },
@@ -432,11 +406,10 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'fi_energy_crystal_charged_item',1},
-            {'el_train_fuel_diesel_item',4},
+            {type="item", name="fi_energy_crystal_charged_item", amount=1},
+            {type="item", name="el_train_fuel_diesel_item", amount=4},
         },
-        result = 'fi_fuel_train_crystal_item',
-        result_count = 4,
+        results = {{type="item", name='fi_fuel_train_crystal_item', amount=4}},
         energy_required = 5,
     },
     --crushed 
@@ -446,10 +419,9 @@ data:extend({
         enabled = false,
         category = 'fi_crushing',
         ingredients = {
-            {'el_lithium_item',1},
+            {type="item", name="el_lithium_item", amount=1},
         },
-        result = 'fi_crushed_lithium_item',
-        result_count = 2,
+        results = {{type="item", name='fi_crushed_lithium_item', amount=2}},
         energy_required = 2,
         always_show_made_in = true,
     },
@@ -459,10 +431,9 @@ data:extend({
         enabled = false,
         category = 'fi_crushing',
         ingredients = {
-            {'iron-plate',1},
+            {type="item", name="iron-plate", amount=1},
         },
-        result = 'fi_crushed_iron_item',
-        result_count = 2,
+        results = {{type="item", name='fi_crushed_iron_item', amount=2}},
         energy_required = 2,
         always_show_made_in = true,
     },
@@ -472,10 +443,9 @@ data:extend({
         enabled = false,
         category = 'fi_crushing',
         ingredients = {
-            {'copper-plate',1},
+            {type="item", name="copper-plate", amount=1},
         },
-        result = 'fi_crushed_copper_item',
-        result_count = 2,
+        results = {{type="item", name='fi_crushed_copper_item', amount=2}},
         energy_required = 2,
         always_show_made_in = true,
     },
@@ -485,10 +455,9 @@ data:extend({
         enabled = false,
         category = 'fi_crushing',
         ingredients = {
-            {'el_aluminum_item',1},
+            {type="item", name="el_aluminum_item", amount=1},
         },
-        result = 'fi_crushed_aluminum_item',
-        result_count = 2,
+        results = {{type="item", name='fi_crushed_aluminum_item', amount=2}},
         energy_required = 2,
         always_show_made_in = true,
     },
@@ -498,10 +467,9 @@ data:extend({
         enabled = false,
         category = 'fi_crushing',
         ingredients = {
-            {'coal',1},
+            {type="item", name="coal", amount=1},
         },
-        result = 'fi_crushed_coal_item',
-        result_count = 2,
+        results = {{type="item", name='fi_crushed_coal_item', amount=2}},
         energy_required = 2,
         always_show_made_in = true,
     },
@@ -511,10 +479,9 @@ data:extend({
         enabled = false,
         category = 'fi_crushing',
         ingredients = {
-            {'stone',1},
+            {type="item", name="stone", amount=1},
         },
-        result = 'fi_crushed_stone_item',
-        result_count = 2,
+        results = {{type="item", name='fi_crushed_stone_item', amount=2}},
         energy_required = 2,
         always_show_made_in = true,
     },
@@ -524,10 +491,9 @@ data:extend({
         enabled = false,
         category = 'fi_crushing',
         ingredients = {
-            {'uranium-238',1},
+            {type="item", name="uranium-238", amount=1},
         },
-        result = 'fi_crushed_uranium_item',
-        result_count = 2,
+        results = {{type="item", name='fi_crushed_uranium_item', amount=2}},
         energy_required = 2,
         always_show_made_in = true,
     },
@@ -537,12 +503,11 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'fi_crushed_coal_item',3},
-            {'fi_crushed_iron_item',4},
-            {'fi_crushed_aluminum_item',1},
+            {type="item", name="fi_crushed_coal_item", amount=3},
+            {type="item", name="fi_crushed_iron_item", amount=4},
+            {type="item", name="fi_crushed_aluminum_item", amount=1},
         },
-        result = 'fi_industrial_steel_blend_item',
-        result_count = 2,
+        results = {{type="item", name='fi_industrial_steel_blend_item', amount=2}},
         energy_required = 4,
     },
     {
@@ -551,10 +516,9 @@ data:extend({
         enabled = false,
         category = 'smelting',
         ingredients = {
-            {'fi_industrial_steel_blend_item',4},
+            {type="item", name="fi_industrial_steel_blend_item", amount=4},
         },
-        result = 'fi_industrial_steel_item',
-        result_count = 2,
+        results = {{type="item", name='fi_industrial_steel_item', amount=2}},
         energy_required = 2,
         always_show_made_in = true,
     },
@@ -564,10 +528,9 @@ data:extend({
         enabled = false,
         category = 'smelting',
         ingredients = {
-            {'fi_industrial_steel_blend_item',1},
+            {type="item", name="fi_industrial_steel_blend_item", amount=1},
         },
-        result = 'steel-plate',
-        result_count = 4,
+        results = {{type="item", name='steel-plate', amount=4}},
         energy_required = 6,
         subgroup = 'fi_item_subgroup_b',
         order = 'b-a',
@@ -579,13 +542,12 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'fi_robo_charger_item',1},
-            {'fi_materials_GFK',40},
-            {'fi_materials_titan',10},
-            {'fi_materials_NFK',20},
+            {type="item", name="fi_robo_charger_item", amount=1},
+            {type="item", name="fi_materials_GFK", amount=40},
+            {type="item", name="fi_materials_titan", amount=10},
+            {type="item", name="fi_materials_NFK", amount=20},
         },
-        result = 'fi_robo_port_item',
-        result_count = 1,
+        results = {{type="item", name='fi_robo_port_item', amount=1}},
         energy_required = 6,
     },
     {
@@ -593,13 +555,12 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'roboport',1},
-            {'el_materials_ALK',60},
-            {'fi_energy_crystal_item',25},
-            {'el_energy_crystal_item',25},
+            {type="item", name="roboport", amount=1},
+            {type="item", name="el_materials_ALK", amount=60},
+            {type="item", name="fi_energy_crystal_item", amount=25},
+            {type="item", name="el_energy_crystal_item", amount=25},
         },
-        result = 'fi_robo_charger_item',
-        result_count = 1,
+        results = {{type="item", name='fi_robo_charger_item', amount=1}},
         energy_required = 6,
     },
     --modules
@@ -608,11 +569,10 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'low-density-structure',2},
-            {'advanced-circuit',6},
+            {type="item", name="low-density-structure", amount=2},
+            {type="item", name="advanced-circuit", amount=6},
         },
-        result = 'fi_modules_base_item',
-        result_count = 1,
+        results = {{type="item", name='fi_modules_base_item', amount=1}},
         energy_required = 6,
     },
     {
@@ -620,11 +580,10 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'fi_modules_base_item',1},
-            {'fi_materials_GFK',1},
+            {type="item", name="fi_modules_base_item", amount=1},
+            {type="item", name="fi_materials_GFK", amount=1},
         },
-        result = 'fi_modules_core_item',
-        result_count = 1,
+        results = {{type="item", name='fi_modules_core_item', amount=1}},
         energy_required = 6,
     },
     {
@@ -632,12 +591,11 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'fi_modules_core_item',1},
-            {'productivity-module',2},
-            {'advanced-circuit',6},
+            {type="item", name="fi_modules_core_item", amount=1},
+            {type="item", name="productivity-module", amount=2},
+            {type="item", name="advanced-circuit", amount=6},
         },
-        result = 'fi_modules_productivity_1_item',
-        result_count = 1,
+        results = {{type="item", name='fi_modules_productivity_1_item', amount=1}},
         energy_required = 6,
     },
     {
@@ -645,13 +603,12 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'fi_modules_productivity_1_item',4},
-            {'fi_modules_core_item',1},
-            {'productivity-module-2',2},
-            {'processing-unit',6},
+            {type="item", name="fi_modules_productivity_1_item", amount=4},
+            {type="item", name="fi_modules_core_item", amount=1},
+            {type="item", name="productivity-module-2", amount=2},
+            {type="item", name="processing-unit", amount=6},
         },
-        result = 'fi_modules_productivity_2_item',
-        result_count = 1,
+        results = {{type="item", name='fi_modules_productivity_2_item', amount=1}},
         energy_required = 6,
     },
     {
@@ -659,13 +616,12 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'fi_modules_productivity_2_item',4},
-            {'fi_modules_core_item',1},
-            {'productivity-module-3',2},
-            {'fu_tech_sign_item',40},
+            {type="item", name="fi_modules_productivity_2_item", amount=4},
+            {type="item", name="fi_modules_core_item", amount=1},
+            {type="item", name="productivity-module-3", amount=2},
+            {type="item", name="fu_tech_sign_item", amount=40},
         },
-        result = 'fi_modules_productivity_3_item',
-        result_count = 1,
+        results = {{type="item", name='fi_modules_productivity_3_item', amount=1}},
         energy_required = 6,
     },
     {
@@ -673,12 +629,11 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'fi_modules_productivity_3_item',6},
-            {'fi_modules_core_item',1},
-            {'gr_materials_stack_up_item',4},
+            {type="item", name="fi_modules_productivity_3_item", amount=6},
+            {type="item", name="fi_modules_core_item", amount=1},
+            {type="item", name="gr_materials_stack_up_item", amount=4},
         },
-        result = 'fi_modules_productivity_4_item',
-        result_count = 1,
+        results = {{type="item", name='fi_modules_productivity_4_item', amount=1}},
         energy_required = 6,
     },
     {
@@ -686,12 +641,11 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'fi_modules_productivity_4_item',6},
-            {'fi_modules_core_item',1},
-            {'gr_materials_stack_down_item',4},
+            {type="item", name="fi_modules_productivity_4_item", amount=6},
+            {type="item", name="fi_modules_core_item", amount=1},
+            {type="item", name="gr_materials_stack_down_item", amount=4},
         },
-        result = 'fi_modules_productivity_5_item',
-        result_count = 1,
+        results = {{type="item", name='fi_modules_productivity_5_item', amount=1}},
         energy_required = 6,
     },
     {
@@ -699,12 +653,11 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'fi_modules_productivity_5_item',6},
-            {'fi_modules_core_item',1},
-            {'gr_materials_fusion_cell_item',4},
+            {type="item", name="fi_modules_productivity_5_item", amount=6},
+            {type="item", name="fi_modules_core_item", amount=1},
+            {type="item", name="gr_materials_fusion_cell_item", amount=4},
         },
-        result = 'fi_modules_productivity_6_item',
-        result_count = 1,
+        results = {{type="item", name='fi_modules_productivity_6_item', amount=1}},
         energy_required = 6,
     },
     {
@@ -713,14 +666,13 @@ data:extend({
         enabled = false,
         category = 'crafting',
         ingredients = {
-            {'concrete',60},
-            {'el_materials_ALK',20},
-            {'iron-gear-wheel',40},
-            {'engine-unit',15},
-            {'el_energy_crystal_item',10},
+            {type="item", name="concrete", amount=60},
+            {type="item", name="el_materials_ALK", amount=20},
+            {type="item", name="iron-gear-wheel", amount=40},
+            {type="item", name="engine-unit", amount=15},
+            {type="item", name="el_energy_crystal_item", amount=10},
         },
-        result = 'fi_fiberer_item',
-        result_count = 1,
+        results = {{type="item", name='fi_fiberer_item', amount=1}},
         energy_required = 4,
     },
     {
@@ -791,10 +743,9 @@ data:extend({
         enabled = false,
         category = 'fi_crushing',
         ingredients = {
-            {'fi_materials_glass',1},
+            {type="item", name="fi_materials_glass", amount=1},
         },
-        result = 'fi_crushed_glass_item',
-        result_count = 2,
+        results = {{type="item", name='fi_crushed_glass_item', amount=2}},
         energy_required = 1,
         always_show_made_in = true,
     },
@@ -1056,14 +1007,13 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'concrete',60},
-            {'el_materials_ALK',60},
-            {'iron-gear-wheel',40},
-            {'engine-unit',15},
-            {'el_energy_crystal_item',20},
+            {type="item", name="concrete", amount=60},
+            {type="item", name="el_materials_ALK", amount=60},
+            {type="item", name="iron-gear-wheel", amount=40},
+            {type="item", name="engine-unit", amount=15},
+            {type="item", name="el_energy_crystal_item", amount=20},
         },
-        result = 'fi_compound_machine_item',
-        result_count = 1,
+        results = {{type="item", name='fi_compound_machine_item', amount=1}},
         energy_required = 4,
     },
     {
@@ -1255,9 +1205,9 @@ data:extend({
         category = 'crafting',
         ingredients = {
             {type="item", name="oil-refinery", amount=1},
-            {'concrete',60},
-            {'el_materials_ALK',20},
-            {'engine-unit',15},
+            {type="item", name="concrete", amount=60},
+            {type="item", name="el_materials_ALK", amount=20},
+            {type="item", name="engine-unit", amount=15},
         },
         results = {
             {type="item", name="fi_refinery_item", amount=1}
@@ -1420,8 +1370,7 @@ data:extend({
         ingredients = {
             {type='item', name='fi_energy_crystal_item', amount=1},
         },
-        result = 'fi_energy_crystal_charged_item',
-        result_count = 1,
+        results = {{type="item", name='fi_energy_crystal_charged_item', amount=1}},
         energy_required = 10,
         always_show_made_in = true,
     },
@@ -1454,7 +1403,6 @@ data:extend({
         results = {
             {type="item", name="fi_grenade", amount=1},
         },
-        result_count = 1,
         energy_required = 4,
     },
     {
@@ -1471,7 +1419,6 @@ data:extend({
         results = {
             {type="item", name="solid-fuel", amount=1},
         },
-        result_count = 1,
         energy_required = 2,
         subgroup = 'fluid-recipes',
         order = 'b[fluid-chemistry]-e[solid-fuel-from-heavy-oil]-a',
@@ -1490,7 +1437,6 @@ data:extend({
         results = {
             {type="item", name="solid-fuel", amount=1},
         },
-        result_count = 1,
         energy_required = 2,
         subgroup = 'fluid-recipes',
         order = 'b[fluid-chemistry]-e[solid-fuel-from-heavy-oil]-b',
@@ -1510,7 +1456,6 @@ data:extend({
         results = {
             {type="item", name="rocket-fuel", amount=1},
         },
-        result_count = 1,
         energy_required = 30,
         subgroup = 'fluid-recipes',
         order = 'b[fluid-chemistry]-e[solid-fuel-from-heavy-oil]-c',
@@ -1530,7 +1475,6 @@ data:extend({
         results = {
             {type="item", name="rocket-fuel", amount=1},
         },
-        result_count = 1,
         energy_required = 30,
         subgroup = 'fluid-recipes',
         order = 'b[fluid-chemistry]-e[solid-fuel-from-heavy-oil]-d',
@@ -1550,7 +1494,6 @@ data:extend({
         results = {
             {type="item", name="rocket-fuel", amount=1},
         },
-        result_count = 1,
         energy_required = 30,
         subgroup = 'fluid-recipes',
         order = 'b[fluid-chemistry]-e[solid-fuel-from-heavy-oil]-d',
@@ -1568,7 +1511,6 @@ data:extend({
         results = {
             {type="item", name="fi_materials_rich_solution", amount=1},
         },
-        result_count = 1,
         energy_required = 0.2,
         always_show_made_in = true,
     },
@@ -1585,7 +1527,6 @@ data:extend({
             {type="fluid", name="fi_dirty_water", amount=1000},
             {type="item", name="fi_materials_empty_solution", amount=1},
         },
-        result_count = 1,
         energy_required = 0.2,
         always_show_made_in = true,
     },
@@ -1602,7 +1543,6 @@ data:extend({
         results = {
             {type="item", name="fi_materials_dirty_solution", amount=1},
         },
-        result_count = 1,
         energy_required = 0.2,
         always_show_made_in = true,
     },
@@ -1619,7 +1559,6 @@ data:extend({
             {type="fluid", name="el_dirty_water", amount=1000},
             {type="item", name="fi_materials_empty_solution", amount=1},
         },
-        result_count = 1,
         energy_required = 0.2,
         always_show_made_in = true,
         subgroup = 'fi_item_subgroup_f',
@@ -1639,7 +1578,6 @@ data:extend({
         results = {
             {type="item", name="fi_materials_upgrade", amount=2},
         },
-        result_count = 1,
         energy_required = 10,
         always_show_made_in = true,
     },
@@ -1656,7 +1594,6 @@ data:extend({
         results = {
             {type="item", name="fu_miner_item_2", amount=1},
         },
-        result_count = 1,
         energy_required = 10,
         always_show_made_in = true,
     },
@@ -1674,7 +1611,6 @@ data:extend({
         results = {
             {type="item", name="fu_materials_upgrade", amount=2},
         },
-        result_count = 1,
         energy_required = 10,
         always_show_made_in = true,
     },
@@ -1691,7 +1627,6 @@ data:extend({
         results = {
             {type="item", name="fu_miner_item_3", amount=1},
         },
-        result_count = 1,
         energy_required = 10,
         always_show_made_in = true,
     },
@@ -1709,7 +1644,6 @@ data:extend({
         results = {
             {type="item", name="gr_materials_upgrade", amount=2},
         },
-        result_count = 1,
         energy_required = 10,
         always_show_made_in = true,
     },
@@ -1726,7 +1660,6 @@ data:extend({
         results = {
             {type="item", name="fu_miner_item_4", amount=1},
         },
-        result_count = 1,
         energy_required = 10,
         always_show_made_in = true,
     },
diff --git a/248k_2/prototypes/fu_recipes.lua b/248k_2/prototypes/fu_recipes.lua
index 59d896a..e2ffa58 100644
--- a/248k_2/prototypes/fu_recipes.lua
+++ b/248k_2/prototypes/fu_recipes.lua
@@ -5,17 +5,16 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'low-density-structure',100},
-            {'fu_materials_TIM',100},
-            {'fu_materials_KFK',100},
-            {'fu_materials_magnet',20},
-            {'fi_energy_crystal_item',100},
-            {'concrete',500},
-            {'lab',10},
-            {'processing-unit',500}
+            {type="item", name="low-density-structure", amount=100},
+            {type="item", name="fu_materials_TIM", amount=100},
+            {type="item", name="fu_materials_KFK", amount=100},
+            {type="item", name="fu_materials_magnet", amount=20},
+            {type="item", name="fi_energy_crystal_item", amount=100},
+            {type="item", name="concrete", amount=500},
+            {type="item", name="lab", amount=10},
+            {type="item", name="processing-unit", amount=500}
         },
-        result = 'fu_fusor_item',
-        result_count = 1,
+        results = {{type="item", name='fu_fusor_item', amount=1}},
         energy_required = 6,
     },
     --reactor
@@ -24,17 +23,16 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'fu_materials_magnet',100},
-            {'fu_materials_TIM',200},
-            {'fu_materials_KFK',200},
-            {'concrete',500},
-            {'fu_materials_energy_crystal',100},
-            {'pump',80},
-            {'processing-unit',500},
-            {'fu_tech_sign_item',100},
+            {type="item", name="fu_materials_magnet", amount=100},
+            {type="item", name="fu_materials_TIM", amount=200},
+            {type="item", name="fu_materials_KFK", amount=200},
+            {type="item", name="concrete", amount=500},
+            {type="item", name="fu_materials_energy_crystal", amount=100},
+            {type="item", name="pump", amount=80},
+            {type="item", name="processing-unit", amount=500},
+            {type="item", name="fu_tech_sign_item", amount=100},
         },
-        result = 'fu_stelar_reactor_item',
-        result_count = 1,
+        results = {{type="item", name='fu_stelar_reactor_item', amount=1}},
         energy_required = 60,
     },
     {
@@ -42,17 +40,16 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'fu_materials_magnet',200},
-            {'fu_materials_TIM',400},
-            {'fu_materials_KFK',400},
-            {'concrete',500},
-            {'fu_materials_energy_crystal',200},
-            {'pump',80},
-            {'processing-unit',500},
-            {'fu_tech_sign_item',2000},
+            {type="item", name="fu_materials_magnet", amount=200},
+            {type="item", name="fu_materials_TIM", amount=400},
+            {type="item", name="fu_materials_KFK", amount=400},
+            {type="item", name="concrete", amount=500},
+            {type="item", name="fu_materials_energy_crystal", amount=200},
+            {type="item", name="pump", amount=80},
+            {type="item", name="processing-unit", amount=500},
+            {type="item", name="fu_tech_sign_item", amount=2000},
         },
-        result = 'fu_tokamak_reactor_item',
-        result_count = 1,
+        results = {{type="item", name='fu_tokamak_reactor_item', amount=1}},
         energy_required = 60,
     },
 
@@ -62,15 +59,14 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'heat-exchanger',4},
-            {'fu_materials_TIM',20},
-            {'fu_materials_KFK',20},
-            {'fi_materials_GFK',20},
-            {'concrete',100},
-            {'heat-pipe',20}
+            {type="item", name="heat-exchanger", amount=4},
+            {type="item", name="fu_materials_TIM", amount=20},
+            {type="item", name="fu_materials_KFK", amount=20},
+            {type="item", name="fi_materials_GFK", amount=20},
+            {type="item", name="concrete", amount=100},
+            {type="item", name="heat-pipe", amount=20}
         },
-        result = 'fu_boiler_item',
-        result_count = 1,
+        results = {{type="item", name='fu_boiler_item', amount=1}},
         energy_required = 2,
     },
     --burner
@@ -80,12 +76,11 @@ data:extend({
         enabled = false,
         hidden = false,
         ingredients = {
-            {'el_burner_item',1},
-            {'pipe',20},
-            {'electronic-circuit',20}  
+            {type="item", name="el_burner_item", amount=1},
+            {type="item", name="pipe", amount=20},
+            {type="item", name="electronic-circuit", amount=20}
         },
-        result = 'fu_burner_item',
-        result_count = 1,
+        results = {{type="item", name='fu_burner_item', amount=1}},
         energy_required = 2,
     },
     --tech sign
@@ -98,8 +93,7 @@ data:extend({
             {type="fluid", name="fu_lithium_6", amount=100},
             {type="fluid", name="fu_protium", amount=100},
         },
-        result = 'fu_materials_fusion_card',
-        result_count = 10,
+        results = {{type="item", name='fu_materials_fusion_card', amount=10}},
         energy_required = 100,
         always_show_made_in = true,
     },
@@ -112,8 +106,7 @@ data:extend({
             {type="fluid", name="fu_lithium_6", amount=100},
             {type="fluid", name="fu_deuterium", amount=100},
         },
-        result = 'fu_materials_fusion_card',
-        result_count = 100,
+        results = {{type="item", name='fu_materials_fusion_card', amount=100}},
         energy_required = 100,
         always_show_made_in = true,
     },
@@ -126,8 +119,7 @@ data:extend({
             {type="fluid", name="fu_deuterium", amount=100},
             {type="fluid", name="fu_tritium", amount=100},
         },
-        result = 'fu_materials_fusion_card',
-        result_count = 500,
+        results = {{type="item", name='fu_materials_fusion_card', amount=500}},
         energy_required = 100,
         always_show_made_in = true,
     },
@@ -139,8 +131,7 @@ data:extend({
         ingredients = {
             {type="fluid", name="fu_deuterium", amount=100},
         },
-        result = 'fu_materials_fusion_card',
-        result_count = 50,
+        results = {{type="item", name='fu_materials_fusion_card', amount=50}},
         energy_required = 100,
         always_show_made_in = true,
     },
@@ -152,8 +143,7 @@ data:extend({
         ingredients = {
             {type="fluid", name="fu_protium", amount=20000},
         },
-        result = 'fu_materials_fusion_card',
-        result_count = 1,
+        results = {{type="item", name='fu_materials_fusion_card', amount=1}},
         energy_required = 100,
         always_show_made_in = true,
     },
@@ -171,7 +161,6 @@ data:extend({
             {type="fluid", name="fu_hydrogen", amount=100},
             {type="fluid", name="fu_oxygen", amount=50}
         },
-        result_count = 1,
         energy_required = 1,
         always_show_made_in = true,
         icon_size = 64,
@@ -199,7 +188,6 @@ data:extend({
             {type="fluid", name="fu_hydrogen", amount=200},
             {type="fluid", name="fu_oxygen", amount=100}
         },
-        result_count = 1,
         energy_required = 1,
         always_show_made_in = true,
         icon_size = 64,
@@ -227,7 +215,6 @@ data:extend({
             {type="fluid", name="fu_hydrogen", amount=500},
             {type="fluid", name="fu_oxygen", amount=150},
         },
-        result_count = 1,
         energy_required = 1,
         always_show_made_in = true,
         icon_size = 64,
@@ -254,7 +241,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_hydrogen", amount=1000},
         },
-        result_count = 1,
         energy_required = 1,
         always_show_made_in = true,
         icon_size = 64,
@@ -297,7 +283,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_lithium_6", amount=5},
         },
-        result_count = 1,
         energy_required = 1,
         always_show_made_in = true,
     },
@@ -311,8 +296,7 @@ data:extend({
             {type="item", name="stone", amount=10},
             {type="fluid", name="sulfuric-acid", amount=20},
         },
-        result = 'fu_lead_ore_item',
-        result_count = 4,
+        results = {{type="item", name='fu_lead_ore_item', amount=4}},
         energy_required = 2,
     },
     --lead ore
@@ -339,8 +323,7 @@ data:extend({
         ingredients = {
             {type="item", name="fu_lead_item", amount=1},
         },
-        result = 'fu_crushed_lead_item',
-        result_count = 2,
+        results = {{type="item", name='fu_crushed_lead_item', amount=2}},
         energy_required = 2,
     },
     {
@@ -354,7 +337,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_lead_fluid_cold", amount=100},
         },
-        result_count = 1,
         energy_required = 10,
         always_show_made_in = true,
     },
@@ -371,7 +353,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_lead_fluid_hot", amount=1000},
         },
-        result_count = 1,
         energy_required = 1,
     },
     {
@@ -387,7 +368,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_lead_fluid_hot", amount=1000},
         },
-        result_count = 1,
         energy_required = 1,
     },
     {
@@ -403,7 +383,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_lead_fluid_hot", amount=1000},
         },
-        result_count = 1,
         energy_required = 1,
     },
     {
@@ -422,7 +401,6 @@ data:extend({
             {type="fluid", name="fu_lead_fluid_hot", amount=300},
             {type="item", name="fu_materials_charged_container", amount=6},
         },
-        result_count = 1,
         energy_required = 1,
         always_show_made_in = true,
         subgroup = 'fu_item_subgroup_e',
@@ -444,7 +422,6 @@ data:extend({
             {type="fluid", name="fu_lead_fluid_hot", amount=300},
             {type="item", name="fu_materials_charged_container", amount=6},
         },
-        result_count = 1,
         energy_required = 1,
         always_show_made_in = true,
         subgroup = 'fu_item_subgroup_e',
@@ -464,7 +441,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_lead_fluid_hot", amount=110000},
         },
-        result_count = 1,
         energy_required = 100,
     },
     {
@@ -480,7 +456,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_lead_fluid_hot", amount=180000},
         },
-        result_count = 1,
         energy_required = 100,
     },
     --exchanger
@@ -497,7 +472,6 @@ data:extend({
         results = {
             {type="item", name="fu_exchanger_item", amount=1},
         },
-        result_count = 1,
         energy_required = 10,
     },
     {
@@ -514,7 +488,6 @@ data:extend({
             {type="fluid", name="fu_lead_fluid_cold", amount=50},
             {type="fluid", name="steam", amount=1000, temperature=500},
         },
-        result_count = 1,
         energy_required = 1,
         subgroup = 'fu_item_subgroup_e',
         order = 'b-a',
@@ -534,7 +507,6 @@ data:extend({
             {type="fluid", name="fu_lead_fluid_cold", amount=100},
             {type="fluid", name="steam", amount=1000, temperature=1000},
         },
-        result_count = 1,
         energy_required = 1,
         subgroup = 'fu_item_subgroup_e',
         order = 'b-a',
@@ -553,7 +525,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_lead_fluid_cold", amount=100},
         },
-        result_count = 1,
         energy_required = 1,
         subgroup = 'fu_item_subgroup_e',
         order = 'b-a',
@@ -572,7 +543,6 @@ data:extend({
         results = {
             {type="item", name="fu_turbine_item", amount=1},
         },
-        result_count = 1,
         energy_required = 10,
     },
     {
@@ -589,7 +559,6 @@ data:extend({
             {type="fluid", name="fu_lead_fluid_cold", amount=100},
             {type="fluid", name="fu_hot_steam", amount=100, temperature=1500},
         },
-        result_count = 1,
         energy_required = 1,
         subgroup = 'fu_item_subgroup_e',
         order = 'b-a',
@@ -608,8 +577,7 @@ data:extend({
             {type="item", name="el_lithium_battery", amount=10},
             {type="item", name="flying-robot-frame", amount=4},
         },
-        result = 'fu_robo_logistic_item',
-        result_count = 1,
+        results = {{type="item", name='fu_robo_logistic_item', amount=1}},
         energy_required = 10,
     },
     {
@@ -624,8 +592,7 @@ data:extend({
             {type="item", name="el_lithium_battery", amount=10},
             {type="item", name="flying-robot-frame", amount=4},
         },
-        result = 'fu_robo_construction_item',
-        result_count = 1,
+        results = {{type="item", name='fu_robo_construction_item', amount=1}},
         energy_required = 10,
     },
     --fu activator
@@ -640,8 +607,7 @@ data:extend({
             {type="item", name="fu_materials_KFK", amount=40},
             {type="item", name="fu_materials_TIM", amount=60},
         },
-        result = 'fu_activator_item',
-        result_count = 1,
+        results = {{type="item", name='fu_activator_item', amount=1}},
         energy_required = 10,
     },
     {
@@ -658,7 +624,6 @@ data:extend({
             {type="fluid", name="fu_protium", amount=9},
             {type="fluid", name="fu_deuterium", amount=1},
         },
-        result_count = 1,
         energy_required = 10,
         always_show_made_in = true,
     },
@@ -676,7 +641,6 @@ data:extend({
             {type="fluid", name="fu_deuterium", amount=9},
             {type="fluid", name="fu_tritium", amount=1},
         },
-        result_count = 1,
         energy_required = 10,
         always_show_made_in = true,
     },
@@ -686,17 +650,16 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'low-density-structure',200},
-            {'fu_materials_KFK',200},
-            {'fu_materials_TIM',200},
-            {'heat-pipe',200},
-            {'concrete',500},
-            {'fu_materials_magnet',100},
-            {'fu_materials_energy_crystal',100},
-            {'fu_tech_sign_item',1000},
+            {type="item", name="low-density-structure", amount=200},
+            {type="item", name="fu_materials_KFK", amount=200},
+            {type="item", name="fu_materials_TIM", amount=200},
+            {type="item", name="heat-pipe", amount=200},
+            {type="item", name="concrete", amount=500},
+            {type="item", name="fu_materials_magnet", amount=100},
+            {type="item", name="fu_materials_energy_crystal", amount=100},
+            {type="item", name="fu_tech_sign_item", amount=1000},
         },
-        result = 'fu_star_engine_cooler_item',
-        result_count = 1,
+        results = {{type="item", name='fu_star_engine_cooler_item', amount=1}},
         energy_required = 60,
     },
     {
@@ -704,17 +667,16 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'low-density-structure',200},
-            {'fu_materials_KFK',200},
-            {'fu_materials_TIM',200},
-            {'heat-pipe',200},
-            {'concrete',500},
-            {'fu_materials_magnet',100},
-            {'fu_materials_energy_crystal',100},
-            {'fu_tech_sign_item',1000},
+            {type="item", name="low-density-structure", amount=200},
+            {type="item", name="fu_materials_KFK", amount=200},
+            {type="item", name="fu_materials_TIM", amount=200},
+            {type="item", name="heat-pipe", amount=200},
+            {type="item", name="concrete", amount=500},
+            {type="item", name="fu_materials_magnet", amount=100},
+            {type="item", name="fu_materials_energy_crystal", amount=100},
+            {type="item", name="fu_tech_sign_item", amount=1000},
         },
-        result = 'fu_star_engine_cooler_up_item',
-        result_count = 1,
+        results = {{type="item", name='fu_star_engine_cooler_up_item', amount=1}},
         energy_required = 60,
     },
     {
@@ -722,17 +684,16 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'low-density-structure',200},
-            {'fu_materials_KFK',200},
-            {'fu_materials_TIM',200},
-            {'heat-pipe',200},
-            {'concrete',500},
-            {'fu_materials_magnet',100},
-            {'fu_materials_energy_crystal',100},
-            {'fu_tech_sign_item',1000},
+            {type="item", name="low-density-structure", amount=200},
+            {type="item", name="fu_materials_KFK", amount=200},
+            {type="item", name="fu_materials_TIM", amount=200},
+            {type="item", name="heat-pipe", amount=200},
+            {type="item", name="concrete", amount=500},
+            {type="item", name="fu_materials_magnet", amount=100},
+            {type="item", name="fu_materials_energy_crystal", amount=100},
+            {type="item", name="fu_tech_sign_item", amount=1000},
         },
-        result = 'fu_star_engine_heater_item',
-        result_count = 1,
+        results = {{type="item", name='fu_star_engine_heater_item', amount=1}},
         energy_required = 60,
     },
     {
@@ -740,17 +701,16 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'low-density-structure',200},
-            {'fu_materials_KFK',200},
-            {'fu_materials_TIM',200},
-            {'heat-pipe',200},
-            {'concrete',500},
-            {'fu_materials_magnet',100},
-            {'fu_materials_energy_crystal',100},
-            {'fu_tech_sign_item',1000},
+            {type="item", name="low-density-structure", amount=200},
+            {type="item", name="fu_materials_KFK", amount=200},
+            {type="item", name="fu_materials_TIM", amount=200},
+            {type="item", name="heat-pipe", amount=200},
+            {type="item", name="concrete", amount=500},
+            {type="item", name="fu_materials_magnet", amount=100},
+            {type="item", name="fu_materials_energy_crystal", amount=100},
+            {type="item", name="fu_tech_sign_item", amount=1000},
         },
-        result = 'fu_star_engine_heater_left_item',
-        result_count = 1,
+        results = {{type="item", name='fu_star_engine_heater_left_item', amount=1}},
         energy_required = 60,
     },
     {
@@ -758,19 +718,18 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'low-density-structure',1000},
-            {'fu_materials_KFK',200},
-            {'fu_materials_TIM',200},
-            {'concrete',2000},
-            {'fu_materials_magnet',200},
-            {'fu_materials_energy_crystal',200},
-            {'processing-unit',3000},
-            {'electronic-circuit',3000},
-            {'advanced-circuit',3000},
-            {'fu_tech_sign_item',1000},
+            {type="item", name="low-density-structure", amount=1000},
+            {type="item", name="fu_materials_KFK", amount=200},
+            {type="item", name="fu_materials_TIM", amount=200},
+            {type="item", name="concrete", amount=2000},
+            {type="item", name="fu_materials_magnet", amount=200},
+            {type="item", name="fu_materials_energy_crystal", amount=200},
+            {type="item", name="processing-unit", amount=3000},
+            {type="item", name="electronic-circuit", amount=3000},
+            {type="item", name="advanced-circuit", amount=3000},
+            {type="item", name="fu_tech_sign_item", amount=1000},
         },
-        result = 'fu_star_engine_core_item',
-        result_count = 1,
+        results = {{type="item", name='fu_star_engine_core_item', amount=1}},
         energy_required = 200,
     },
     --star fusion
@@ -787,7 +746,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_protium_heated", amount=13000},
         },
-        result_count = 1,
         energy_required = 1,
     },
     --core
@@ -803,7 +761,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_iron_heated", amount=500*2},
         },
-        result_count = 1,
         energy_required = 1,
     },
     {
@@ -818,7 +775,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_copper_heated", amount=500*2},
         },
-        result_count = 1,
         energy_required = 1,
     },
     {
@@ -833,7 +789,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_sulfur_heated", amount=500*2},
         },
-        result_count = 1,
         energy_required = 1,
     },
     {
@@ -848,7 +803,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_lithium_7_heated", amount=500*2},
         },
-        result_count = 1,
         energy_required = 1,
     },
     {
@@ -863,7 +817,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_uranium_235_heated", amount=500*2},
         },
-        result_count = 1,
         energy_required = 1,
     },
     {
@@ -878,7 +831,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_uranium_238_heated", amount=500*2},
         },
-        result_count = 1,
         energy_required = 1,
     },
     --cooler
@@ -894,7 +846,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_iron", amount=500},
         },
-        result_count = 1,
         energy_required = 1,
     },
     {
@@ -909,7 +860,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_copper", amount=500},
         },
-        result_count = 1,
         energy_required = 1,
     },
     {
@@ -924,7 +874,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_sulfur", amount=500},
         },
-        result_count = 1,
         energy_required = 1,
     },
     {
@@ -939,7 +888,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_lithium_7", amount=500},
         },
-        result_count = 1,
         energy_required = 1,
     },
     {
@@ -954,7 +902,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_uranium_235", amount=500},
         },
-        result_count = 1,
         energy_required = 1,
     },
     {
@@ -969,7 +916,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_uranium_238", amount=500},
         },
-        result_count = 1,
         energy_required = 1,
     },
     --caster
@@ -985,7 +931,6 @@ data:extend({
         results = {
             {type="item", name="iron-plate", amount=500},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
@@ -1000,7 +945,6 @@ data:extend({
         results = {
             {type="item", name="copper-plate", amount=500},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
@@ -1015,7 +959,6 @@ data:extend({
         results = {
             {type="item", name="sulfur", amount=500},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
@@ -1030,7 +973,6 @@ data:extend({
         results = {
             {type="item", name="el_lithium_item", amount=500},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
@@ -1045,7 +987,6 @@ data:extend({
         results = {
             {type="item", name="uranium-235", amount=500},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
@@ -1060,7 +1001,6 @@ data:extend({
         results = {
             {type="item", name="uranium-238", amount=500},
         },
-        result_count = 1,
         energy_required = 6,
     },
     --space probes
@@ -1080,7 +1020,6 @@ data:extend({
         results = {
             {type="item", name="fu_space_probe_sputnik_item", amount=1},
         },
-        result_count = 1,
         energy_required = 20,
         always_show_made_in = true,
     },
@@ -1099,7 +1038,6 @@ data:extend({
         results = {
             {type="item", name="fu_space_probe_probe_item", amount=1},
         },
-        result_count = 1,
         energy_required = 20,
         always_show_made_in = true,
     },
@@ -1118,7 +1056,6 @@ data:extend({
         results = {
             {type="item", name="fu_space_probe_deep_probe_item", amount=1},
         },
-        result_count = 1,
         energy_required = 20,
         always_show_made_in = true,
     },
@@ -1135,7 +1072,6 @@ data:extend({
         results = {
             {type="item", name="fu_space_probe_data_card_2_item", amount=1},
         },
-        result_count = 1,
         energy_required = 10,
         always_show_made_in = true,
     },
@@ -1154,7 +1090,6 @@ data:extend({
             {type="item", name="fu_space_probe_down_matter_item", amount=1},
             {type="item", name="fu_space_probe_up_matter_item", amount=1},
         },
-        result_count = 1,
         energy_required = 10,
         always_show_made_in = true,
     },
@@ -1172,7 +1107,6 @@ data:extend({
         results = {
             {type="item", name="fu_space_probe_science_item", amount=200},
         },
-        result_count = 1,
         energy_required = 3,
     },
     {
@@ -1188,7 +1122,6 @@ data:extend({
         results = {
             {type="item", name="fu_space_probe_science_item_1", amount=200},
         },
-        result_count = 1,
         energy_required = 3,
     },
     --crystals
@@ -1205,7 +1138,6 @@ data:extend({
         results = {
             {type="item", name="fi_energy_crystal_item", amount=1},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
@@ -1213,16 +1145,15 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'concrete',100},
-            {'fu_materials_TIM',60},
-            {'fu_materials_KFK',60},
-            {'fi_materials_GFK',60},
-            {'iron-gear-wheel',40},
-            {'laser-turret',2},
-            {'fi_energy_crystal_item',100},
+            {type="item", name="concrete", amount=100},
+            {type="item", name="fu_materials_TIM", amount=60},
+            {type="item", name="fu_materials_KFK", amount=60},
+            {type="item", name="fi_materials_GFK", amount=60},
+            {type="item", name="iron-gear-wheel", amount=40},
+            {type="item", name="laser-turret", amount=2},
+            {type="item", name="fi_energy_crystal_item", amount=100},
         },
-        result = 'fu_laser_item',
-        result_count = 1,
+        results = {{type="item", name='fu_laser_item', amount=1}},
         energy_required = 4,
     },
     {
@@ -1240,7 +1171,6 @@ data:extend({
             {type="item", name="fu_materials_energy_crystal", amount=1},
             {type="fluid", name="fu_lead_fluid_hot", amount=10}
         },
-        result_count = 1,
         energy_required = 3,
         always_show_made_in = true,
     },
@@ -1257,7 +1187,6 @@ data:extend({
         results = {
             {type="item", name="fu_materials_refined_crystal", amount=1}
         },
-        result_count = 1,
         energy_required = 10,
         always_show_made_in = true,
     },
@@ -1266,16 +1195,15 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'concrete',100},
-            {'fu_materials_TIM',60},
-            {'fu_materials_KFK',60},
-            {'fi_materials_GFK',60},
-            {'iron-gear-wheel',40},
-            {'fi_materials_neodym',60},
-            {'electric-furnace',10},
+            {type="item", name="concrete", amount=100},
+            {type="item", name="fu_materials_TIM", amount=60},
+            {type="item", name="fu_materials_KFK", amount=60},
+            {type="item", name="fi_materials_GFK", amount=60},
+            {type="item", name="iron-gear-wheel", amount=40},
+            {type="item", name="fi_materials_neodym", amount=60},
+            {type="item", name="electric-furnace", amount=10},
         },
-        result = 'fu_plasma_item',
-        result_count = 1,
+        results = {{type="item", name='fu_plasma_item', amount=1}},
         energy_required = 4,
     },
     {
@@ -1283,16 +1211,15 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'concrete',100},
-            {'fu_materials_TIM',60},
-            {'fu_materials_KFK',60},
-            {'fi_materials_GFK',60},
-            {'iron-gear-wheel',40},
-            {'electric-engine-unit',20},
-            {'fi_materials_neodym',200},
+            {type="item", name="concrete", amount=100},
+            {type="item", name="fu_materials_TIM", amount=60},
+            {type="item", name="fu_materials_KFK", amount=60},
+            {type="item", name="fi_materials_GFK", amount=60},
+            {type="item", name="iron-gear-wheel", amount=40},
+            {type="item", name="electric-engine-unit", amount=20},
+            {type="item", name="fi_materials_neodym", amount=200},
         },
-        result = 'fu_magnet_item',
-        result_count = 1,
+        results = {{type="item", name='fu_magnet_item', amount=1}},
         energy_required = 4,
     },
     {
@@ -1493,7 +1420,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_lead_fluid_cold", amount=100},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
@@ -1509,7 +1435,6 @@ data:extend({
         results = {
             {type="item", name="fu_materials_empty_container", amount=1},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
@@ -1525,7 +1450,6 @@ data:extend({
             {type="item", name="fu_materials_empty_container", amount=1},
             {type="fluid", name="fu_neutron_fluid", amount=2},
         },
-        result_count = 1,
         energy_required = 1,
     },
     {
@@ -1541,7 +1465,6 @@ data:extend({
             {type="item", name="fi_used_advanced_thorium_fuel_item", amount=1},
             {type="fluid", name="fu_neutron_fluid", amount=30},
         },
-        result_count = 1,
         energy_required = 4,
     },
     {
@@ -1557,7 +1480,6 @@ data:extend({
             {type="item", name="fi_used_basic_fuel_item", amount=1},
             {type="fluid", name="fu_neutron_fluid", amount=30},
         },
-        result_count = 1,
         energy_required = 4,
     },
     {
@@ -1573,7 +1495,6 @@ data:extend({
             {type="item", name="fi_used_basic_thorium_fuel_item", amount=1},
             {type="fluid", name="fu_neutron_fluid", amount=18},
         },
-        result_count = 1,
         energy_required = 4,
     },
     {
@@ -1589,7 +1510,6 @@ data:extend({
             {type="item", name="fi_used_advanced_fuel_item", amount=1},
             {type="fluid", name="fu_neutron_fluid", amount=34},
         },
-        result_count = 1,
         energy_required = 4,
     },
     --Burner recipe
@@ -1605,7 +1525,6 @@ data:extend({
             {type="fluid", name="fu_oxygen", amount=60},
         },
         results = {},
-        result_count = 1,
         energy_required = 1,
         always_show_made_in = true,
         subgroup = 'fu_item_subgroup_f',
@@ -1622,7 +1541,6 @@ data:extend({
         results = {
             {type="fluid", name="water", amount=100},
         },
-        result_count = 1,
         energy_required = 1,
         always_show_made_in = true,
         subgroup = 'fu_item_subgroup_f',
@@ -1638,7 +1556,6 @@ data:extend({
             {type="fluid", name="water", amount=100},
         },
         results = {},
-        result_count = 1,
         energy_required = 1,
         always_show_made_in = true,
         subgroup = 'fu_item_subgroup_f',
@@ -1654,7 +1571,6 @@ data:extend({
         results = {
             {type="fluid", name="water", amount=100},
         },
-        result_count = 1,
         energy_required = 1,
         always_show_made_in = true,
         subgroup = 'fu_item_subgroup_f',
@@ -1673,7 +1589,6 @@ data:extend({
         results = {
             {type="item", name="fu_miner_item", amount=1},
         },
-        result_count = 20,
         energy_required = 10,
         always_show_made_in = true,
         subgroup = 'fi_item_subgroup_c',
@@ -1687,7 +1602,6 @@ data:extend({
         results = {
             {type="item", name="fu_materials_stone", amount=1},
         },
-        result_count = 1,
         energy_required = 1.5,
         always_show_made_in = true,
         subgroup = 'fi_item_subgroup_a',
@@ -1708,7 +1622,6 @@ data:extend({
             {type="item", name="fu_materials_stone", amount=1, probability=0.25},
             {type="fluid", name="el_dirty_water", amount=10},
         },
-        result_count = 1,
         energy_required = 0.5,
         always_show_made_in = true,
         subgroup = 'fi_item_subgroup_a',
@@ -1724,7 +1637,6 @@ data:extend({
         results = {
             {type="item", name="stone", amount=4},
         },
-        result_count = 1,
         energy_required = 0.5,
         always_show_made_in = true,
         subgroup = 'fi_item_subgroup_a',
@@ -1741,7 +1653,6 @@ data:extend({
         results = {
             {type="item", name="fu_miner_fuel_item", amount=1},
         },
-        result_count = 1,
         energy_required = 6,
         subgroup = 'fi_item_subgroup_b',
     },
@@ -1753,8 +1664,7 @@ data:extend({
         ingredients = {
             {type='item', name='fu_materials_energy_crystal', amount=1},
         },
-        result = 'fu_materials_energy_charged_crystal',
-        result_count = 1,
+        results = {{type="item", name='fu_materials_energy_charged_crystal', amount=1}},
         energy_required = 30,
         always_show_made_in = true,
     },
@@ -1773,7 +1683,6 @@ data:extend({
             {type="fluid", name="fu_oxygen", amount=50},
             {type="item", name="fi_materials_gold", amount=1, probability=0.25},
         },
-        result_count = 1,
         energy_required = 5,
         always_show_made_in = true,
         icon_size = 64,
@@ -1803,7 +1712,6 @@ data:extend({
             {type="fluid", name="fu_oxygen", amount=100},
             {type="item", name="fi_materials_gold", amount=1, probability=0.55},
         },
-        result_count = 1,
         energy_required = 5,
         always_show_made_in = true,
         icon_size = 64,
@@ -1833,7 +1741,6 @@ data:extend({
             {type="fluid", name="fu_oxygen", amount=150},
             {type="item", name="fi_materials_gold", amount=1, probability=0.85},
         },
-        result_count = 1,
         energy_required = 5,
         always_show_made_in = true,
         icon_size = 64,
@@ -1860,7 +1767,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_hydrogen", amount=1000},
         },
-        result_count = 1,
         energy_required = 5,
         always_show_made_in = true,
         icon_size = 64,
@@ -1888,7 +1794,6 @@ data:extend({
         results = {
             {type="item", name="fu_grenade", amount=1},
         },
-        result_count = 1,
         energy_required = 4,
     },
     {
@@ -1908,7 +1813,6 @@ data:extend({
         results = {
             {type="item", name="fu_lab_item", amount=1},
         },
-        result_count = 1,
         energy_required = 10,
     },
     {
@@ -1918,17 +1822,16 @@ data:extend({
         category = 'crafting',
         main_product = 'fu_ingot_item',
         ingredients = {
-            {'concrete',50},
-            {'fu_materials_TIM',40},
-            {'fu_materials_KFK',40},
-            {'fi_materials_GFK',40},
-            {'iron-gear-wheel',20},
-            {'electric-furnace',2},
+            {type="item", name="concrete", amount=50},
+            {type="item", name="fu_materials_TIM", amount=40},
+            {type="item", name="fu_materials_KFK", amount=40},
+            {type="item", name="fi_materials_GFK", amount=40},
+            {type="item", name="iron-gear-wheel", amount=20},
+            {type="item", name="electric-furnace", amount=2},
         },
         results = {
             {type="item", name="fu_ingot_item", amount=1},
         },
-        result_count = 1,
         energy_required = 5,
     },
     {
@@ -1944,7 +1847,6 @@ data:extend({
             {type="item", name="fu_materials_gold_ingot", amount=1},
             {type="item", name="fu_materials_slag", amount=1, probability=0.25},
         },
-        result_count = 1,
         energy_required = 0.2*6,
         subgroup = 'fu_item_subgroup_a',
         order = 'a-a-a',
@@ -1962,7 +1864,6 @@ data:extend({
         results = {
             {type="item", name="fi_materials_gold", amount=2},
         },
-        result_count = 1,
         energy_required = 0.2,
         subgroup = 'fu_item_subgroup_a',
         order = 'a-a-b',
@@ -1981,7 +1882,6 @@ data:extend({
             {type="item", name="fu_materials_neodym_ingot", amount=1},
             {type="item", name="fu_materials_slag", amount=1, probability=0.25},
         },
-        result_count = 1,
         energy_required = 0.2*6,
         subgroup = 'fu_item_subgroup_a',
         order = 'a-a-a',
@@ -1999,7 +1899,6 @@ data:extend({
         results = {
             {type="item", name="fi_materials_neodym", amount=2},
         },
-        result_count = 1,
         energy_required = 0.2,
         subgroup = 'fu_item_subgroup_a',
         order = 'a-a-b',
@@ -2018,7 +1917,6 @@ data:extend({
             {type="item", name="fu_materials_titan_ingot", amount=1},
             {type="item", name="fu_materials_slag", amount=1, probability=0.25},
         },
-        result_count = 1,
         energy_required = 0.2*6,
         subgroup = 'fu_item_subgroup_a',
         order = 'a-a-a',
@@ -2036,7 +1934,6 @@ data:extend({
         results = {
             {type="item", name="fi_materials_titan", amount=2},
         },
-        result_count = 1,
         energy_required = 0.2,
         subgroup = 'fu_item_subgroup_a',
         order = 'a-a-b',
@@ -2055,7 +1952,6 @@ data:extend({
             {type="item", name="fu_materials_lead_ingot", amount=1},
             {type="item", name="fu_materials_slag", amount=1, probability=0.25},
         },
-        result_count = 1,
         energy_required = 0.2*6,
         subgroup = 'fu_item_subgroup_a',
         order = 'a-a-a',
@@ -2073,7 +1969,6 @@ data:extend({
         results = {
             {type="item", name="fu_lead_item", amount=2},
         },
-        result_count = 1,
         energy_required = 0.2,
         subgroup = 'fu_item_subgroup_a',
         order = 'a-a-b',
@@ -2092,7 +1987,6 @@ data:extend({
         results = {
             {type="fluid", name="el_dirty_water", amount=25},
         },
-        result_count = 1,
         energy_required = 0.2,
         always_show_made_in = true,
         subgroup = 'fu_item_subgroup_f',
diff --git a/248k_2/prototypes/fusion/fu_space_probe.lua b/248k_2/prototypes/fusion/fu_space_probe.lua
index 7182b80..b0a305a 100644
--- a/248k_2/prototypes/fusion/fu_space_probe.lua
+++ b/248k_2/prototypes/fusion/fu_space_probe.lua
@@ -17,7 +17,7 @@ data:extend({
         icon_size = 64,
         stack_size = 1,
         subgroup = 'fu_item_subgroup_d',
-        rocket_launch_product = {'fu_space_probe_data_card_1_item',10},
+        rocket_launch_products = {{type="item", name="fu_space_probe_data_card_1_item", amount=10}},
         order = 'd-a',
     },
     {
@@ -27,7 +27,7 @@ data:extend({
         icon_size = 64,
         stack_size = 1,
         subgroup = 'fu_item_subgroup_d',
-        rocket_launch_product = {'fu_space_probe_data_card_3_item',10},
+        rocket_launch_products = {{type="item", name="fu_space_probe_data_card_3_item", amount=10}},
         order = 'd-b',
     },
     {
@@ -37,7 +37,7 @@ data:extend({
         icon_size = 64,
         stack_size = 1,
         subgroup = 'fu_item_subgroup_d',
-        rocket_launch_product = {'fu_space_probe_ore_item',100},
+        rocket_launch_products = {{type="item", name="fu_space_probe_ore_item", amount=100}},
         order = 'd-c',
     },
     --data cards
diff --git a/248k_2/prototypes/gr_recipes.lua b/248k_2/prototypes/gr_recipes.lua
index e0bd139..f34e3f7 100644
--- a/248k_2/prototypes/gr_recipes.lua
+++ b/248k_2/prototypes/gr_recipes.lua
@@ -5,14 +5,13 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'fi_crafter_item',2},
-            {'fu_materials_KFK',100},
-            {'fu_materials_magnet',10},
-            {'gr_materials_fusion_cell_item',1},
-            {'gr_materials_circuit',10}
+            {type="item", name="fi_crafter_item", amount=2},
+            {type="item", name="fu_materials_KFK", amount=100},
+            {type="item", name="fu_materials_magnet", amount=10},
+            {type="item", name="gr_materials_fusion_cell_item", amount=1},
+            {type="item", name="gr_materials_circuit", amount=10}
         },
-        result = 'gr_crafter_item',
-        result_count = 1,
+        results = {{type="item", name='gr_crafter_item', amount=1}},
         energy_required = 6,
     },
     {
@@ -21,12 +20,11 @@ data:extend({
         enabled = false,
         category = 'fi_crafting_category',
         ingredients = {
-            {'fu_space_probe_up_matter_item',1},
-            {'fu_tech_sign_item',40},
-            {'fusion-reactor-equipment',1}
+            {type="item", name="fu_space_probe_up_matter_item", amount=1},
+            {type="item", name="fu_tech_sign_item", amount=40},
+            {type="item", name="fusion-reactor-equipment", amount=1}
         },
-        result = 'gr_materials_fusion_cell_item',
-        result_count = 1,
+        results = {{type="item", name='gr_materials_fusion_cell_item', amount=1}},
         energy_required = 35,
     },
     {
@@ -34,12 +32,11 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'fu_space_probe_down_matter_item',2},
-            {'low-density-structure',10},
-            {'fu_space_probe_data_card_3_item',1},
+            {type="item", name="fu_space_probe_down_matter_item", amount=2},
+            {type="item", name="low-density-structure", amount=10},
+            {type="item", name="fu_space_probe_data_card_3_item", amount=1},
         },
-        result = 'gr_materials_stack_down_item',
-        result_count = 1,
+        results = {{type="item", name='gr_materials_stack_down_item', amount=1}},
         energy_required = 10,
     },
     {
@@ -47,12 +44,11 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'fu_space_probe_up_matter_item',2},
-            {'low-density-structure',10},
-            {'fu_space_probe_data_card_3_item',1},
+            {type="item", name="fu_space_probe_up_matter_item", amount=2},
+            {type="item", name="low-density-structure", amount=10},
+            {type="item", name="fu_space_probe_data_card_3_item", amount=1},
         },
-        result = 'gr_materials_stack_up_item',
-        result_count = 1,
+        results = {{type="item", name='gr_materials_stack_up_item', amount=1}},
         energy_required = 10,
     },
     {
@@ -67,7 +63,6 @@ data:extend({
         results = {
             {type="item", name="iron-gear-wheel", amount=500},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
@@ -82,7 +77,6 @@ data:extend({
         results = {
             {type="item", name="steel-plate", amount=500},
         },
-        result_count = 1,
         energy_required = 6,
     },
     --train
@@ -100,7 +94,6 @@ data:extend({
         results = {
             {type="item", name="gr_magnet_train_item", amount=1},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
@@ -117,7 +110,6 @@ data:extend({
         results = {
             {type="item", name="gr_magnet_wagon_item", amount=1},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
@@ -134,7 +126,6 @@ data:extend({
         results = {
             {type="item", name="gr_magnet_tanker_item", amount=1},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
@@ -151,7 +142,6 @@ data:extend({
         results = {
             {type="item", name="gr_magnet_train_pre_item", amount=1},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
@@ -168,7 +158,6 @@ data:extend({
         results = {
             {type="item", name="gr_magnet_wagon_pre_item", amount=1},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
@@ -185,7 +174,6 @@ data:extend({
         results = {
             {type="item", name="gr_magnet_tanker_pre_item", amount=1},
         },
-        result_count = 1,
         energy_required = 6,
     },
     --kovarex for matter 
@@ -202,7 +190,6 @@ data:extend({
             {type="item", name="fu_space_probe_down_matter_item", amount=9},
             {type="item", name="fu_space_probe_up_matter_item", amount=1}
         },
-        result_count = 1,
         energy_required = 100,
         always_show_made_in = true
     },
@@ -219,7 +206,6 @@ data:extend({
             {type="item", name="fu_space_probe_up_matter_item", amount=9},
             {type="item", name="fu_space_probe_down_matter_item", amount=1}
         },
-        result_count = 1,
         energy_required = 100,
         always_show_made_in = true
     },
@@ -230,18 +216,17 @@ data:extend({
         enabled = false,
         main_product = 'gr_charger_item',
         ingredients = {
-            {'low-density-structure',100},
-            {'fu_materials_KFK',100},
-            {'gr_materials_magnet',100},
-            {'fu_tech_sign_item',1000},
-            {'concrete',500},
-            {'lab',10},
-            {'gr_materials_circuit',100}
+            {type="item", name="low-density-structure", amount=100},
+            {type="item", name="fu_materials_KFK", amount=100},
+            {type="item", name="gr_materials_magnet", amount=100},
+            {type="item", name="fu_tech_sign_item", amount=1000},
+            {type="item", name="concrete", amount=500},
+            {type="item", name="lab", amount=10},
+            {type="item", name="gr_materials_circuit", amount=100}
         },
         results = {
             {type="item", name="gr_charger_item", amount=1}
         },
-        result_count = 1,
         energy_required = 5
     },
     {
@@ -251,14 +236,13 @@ data:extend({
         enabled = false,
         main_product = 'gr_materials_stabilizer_item',
         ingredients = {
-            {'gr_materials_crushed_exotic_item',1},
-            {'fu_materials_energy_crystal',10},
-            {'fu_tech_sign_item',10},
+            {type="item", name="gr_materials_crushed_exotic_item", amount=1},
+            {type="item", name="fu_materials_energy_crystal", amount=10},
+            {type="item", name="fu_tech_sign_item", amount=10},
         },
         results = {
             {type="item", name="gr_materials_stabilizer_item", amount=4}
         },
-        result_count = 1,
         energy_required = 4,
         always_show_made_in = true
     },
@@ -268,10 +252,9 @@ data:extend({
         enabled = false,
         category = 'fi_crushing',
         ingredients = {
-            {'fu_space_probe_ore_item',1},
+            {type="item", name="fu_space_probe_ore_item", amount=1},
         },
-        result = 'gr_materials_crushed_exotic_item',
-        result_count = 2,
+        results = {{type="item", name='gr_materials_crushed_exotic_item', amount=2}},
         energy_required = 2,
         always_show_made_in = true
     },
@@ -280,17 +263,16 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'fu_star_engine_core_item',1},
-            {'fu_star_engine_heater_left_item',1},
-            {'fu_star_engine_heater_item',1},
-            {'fu_star_engine_cooler_up_item',1},
-            {'fu_star_engine_cooler_item',1},
-            {'gr_materials_stack_up_item',40},
-            {'gr_materials_stack_down_item',40},
-            {'gr_materials_magnet',100},
+            {type="item", name="fu_star_engine_core_item", amount=1},
+            {type="item", name="fu_star_engine_heater_left_item", amount=1},
+            {type="item", name="fu_star_engine_heater_item", amount=1},
+            {type="item", name="fu_star_engine_cooler_up_item", amount=1},
+            {type="item", name="fu_star_engine_cooler_item", amount=1},
+            {type="item", name="gr_materials_stack_up_item", amount=40},
+            {type="item", name="gr_materials_stack_down_item", amount=40},
+            {type="item", name="gr_materials_magnet", amount=100},
         },
-        result = 'gr_black_hole_item',
-        result_count = 1,
+        results = {{type="item", name='gr_black_hole_item', amount=1}},
         energy_required = 200,
     },
     {
@@ -298,17 +280,16 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'fu_star_engine_core_item',1},
-            {'fu_star_engine_heater_left_item',1},
-            {'fu_star_engine_heater_item',1},
-            {'fu_star_engine_cooler_up_item',1},
-            {'fu_star_engine_cooler_item',1},
-            {'gr_materials_stack_up_item',40},
-            {'gr_materials_stack_down_item',40},
-            {'gr_materials_magnet',100},
+            {type="item", name="fu_star_engine_core_item", amount=1},
+            {type="item", name="fu_star_engine_heater_left_item", amount=1},
+            {type="item", name="fu_star_engine_heater_item", amount=1},
+            {type="item", name="fu_star_engine_cooler_up_item", amount=1},
+            {type="item", name="fu_star_engine_cooler_item", amount=1},
+            {type="item", name="gr_materials_stack_up_item", amount=40},
+            {type="item", name="gr_materials_stack_down_item", amount=40},
+            {type="item", name="gr_materials_magnet", amount=100},
         },
-        result = 'gr_white_hole_item',
-        result_count = 1,
+        results = {{type="item", name='gr_white_hole_item', amount=1}},
         energy_required = 200,
     },
     {
@@ -316,15 +297,14 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'gr_materials_stack_up_item',10},
-            {'gr_materials_stack_down_item',10},
-            {'lab',40},
-            {'fu_materials_KFK',100},
-            {'fu_materials_TIM',100},
-            {'gr_materials_magnet',100},
+            {type="item", name="gr_materials_stack_up_item", amount=10},
+            {type="item", name="gr_materials_stack_down_item", amount=10},
+            {type="item", name="lab", amount=40},
+            {type="item", name="fu_materials_KFK", amount=100},
+            {type="item", name="fu_materials_TIM", amount=100},
+            {type="item", name="gr_materials_magnet", amount=100},
         },
-        result = 'gr_lab_item',
-        result_count = 1,
+        results = {{type="item", name='gr_lab_item', amount=1}},
         energy_required = 20,
     },
     --endgame
@@ -335,11 +315,10 @@ data:extend({
         enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'automation-science-pack',100},
-            {'gr_materials_data_item',1}
+            {type="item", name="automation-science-pack", amount=100},
+            {type="item", name="gr_materials_data_item", amount=1}
         },
-        result = 'gr_materials_red_data_item',
-        result_count = 1,
+        results = {{type="item", name='gr_materials_red_data_item', amount=1}},
         energy_required = 10,
         always_show_made_in = true
     },
@@ -349,10 +328,9 @@ data:extend({
         enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'gr_materials_red_data_item',36},
+            {type="item", name="gr_materials_red_data_item", amount=36},
         },
-        result = 'gr_materials_red_item',
-        result_count = 1,
+        results = {{type="item", name='gr_materials_red_item', amount=1}},
         energy_required = 100,
         always_show_made_in = true
     },
@@ -364,11 +342,10 @@ data:extend({
         enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'logistic-science-pack',100},
-            {'gr_materials_data_item',1}
+            {type="item", name="logistic-science-pack", amount=100},
+            {type="item", name="gr_materials_data_item", amount=1}
         },
-        result = 'gr_materials_green_data_item',
-        result_count = 1,
+        results = {{type="item", name='gr_materials_green_data_item', amount=1}},
         energy_required = 10,
         always_show_made_in = true
     },
@@ -378,11 +355,10 @@ data:extend({
         enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'gr_materials_green_data_item',72},
-            {'gr_materials_red_item',2}
+            {type="item", name="gr_materials_green_data_item", amount=72},
+            {type="item", name="gr_materials_red_item", amount=2}
         },
-        result = 'gr_materials_green_item',
-        result_count = 1,
+        results = {{type="item", name='gr_materials_green_item', amount=1}},
         energy_required = 100,
         always_show_made_in = true
     },
@@ -394,11 +370,10 @@ data:extend({
         enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'chemical-science-pack',100},
-            {'gr_materials_data_item',1}
+            {type="item", name="chemical-science-pack", amount=100},
+            {type="item", name="gr_materials_data_item", amount=1}
         },
-        result = 'gr_materials_blue_data_item',
-        result_count = 1,
+        results = {{type="item", name='gr_materials_blue_data_item', amount=1}},
         energy_required = 10,
         always_show_made_in = true
     },
@@ -408,11 +383,10 @@ data:extend({
         enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'gr_materials_blue_data_item',155},
-            {'gr_materials_green_item',2}
+            {type="item", name="gr_materials_blue_data_item", amount=155},
+            {type="item", name="gr_materials_green_item", amount=2}
         },
-        result = 'gr_materials_blue_item',
-        result_count = 1,
+        results = {{type="item", name='gr_materials_blue_item', amount=1}},
         energy_required = 100,
         always_show_made_in = true
     },
@@ -424,11 +398,10 @@ data:extend({
         enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'production-science-pack',100},
-            {'gr_materials_data_item',1}
+            {type="item", name="production-science-pack", amount=100},
+            {type="item", name="gr_materials_data_item", amount=1}
         },
-        result = 'gr_materials_purple_data_item',
-        result_count = 1,
+        results = {{type="item", name='gr_materials_purple_data_item', amount=1}},
         energy_required = 10,
         always_show_made_in = true
     },
@@ -438,11 +411,10 @@ data:extend({
         enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'gr_materials_purple_data_item',310},
-            {'gr_materials_blue_item',2}
+            {type="item", name="gr_materials_purple_data_item", amount=310},
+            {type="item", name="gr_materials_blue_item", amount=2}
         },
-        result = 'gr_materials_purple_item',
-        result_count = 1,
+        results = {{type="item", name='gr_materials_purple_item', amount=1}},
         energy_required = 100,
         always_show_made_in = true
     },
@@ -454,11 +426,10 @@ data:extend({
         enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'utility-science-pack',100},
-            {'gr_materials_data_item',1}
+            {type="item", name="utility-science-pack", amount=100},
+            {type="item", name="gr_materials_data_item", amount=1}
         },
-        result = 'gr_materials_yellow_data_item',
-        result_count = 1,
+        results = {{type="item", name='gr_materials_yellow_data_item', amount=1}},
         energy_required = 10,
         always_show_made_in = true
     },
@@ -468,11 +439,10 @@ data:extend({
         enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'gr_materials_yellow_data_item',620},
-            {'gr_materials_purple_item',2}
+            {type="item", name="gr_materials_yellow_data_item", amount=620},
+            {type="item", name="gr_materials_purple_item", amount=2}
         },
-        result = 'gr_materials_yellow_item',
-        result_count = 1,
+        results = {{type="item", name='gr_materials_yellow_item', amount=1}},
         energy_required = 100,
         always_show_made_in = true
     },
@@ -485,11 +455,10 @@ data:extend({
         enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'space-science-pack',100},
-            {'gr_materials_data_item',1}
+            {type="item", name="space-science-pack", amount=100},
+            {type="item", name="gr_materials_data_item", amount=1}
         },
-        result = 'gr_materials_grey_data_item',
-        result_count = 1,
+        results = {{type="item", name='gr_materials_grey_data_item', amount=1}},
         energy_required = 10,
         always_show_made_in = true
     },
@@ -499,11 +468,10 @@ data:extend({
         enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'gr_materials_grey_data_item',1240},
-            {'gr_materials_yellow_item',2}
+            {type="item", name="gr_materials_grey_data_item", amount=1240},
+            {type="item", name="gr_materials_yellow_item", amount=2}
         },
-        result = 'gr_materials_grey_item',
-        result_count = 1,
+        results = {{type="item", name='gr_materials_grey_item', amount=1}},
         energy_required = 100,
         always_show_made_in = true
     },
@@ -515,11 +483,10 @@ data:extend({
         enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'fu_space_probe_science_item',100},
-            {'gr_materials_data_item',1}
+            {type="item", name="fu_space_probe_science_item", amount=100},
+            {type="item", name="gr_materials_data_item", amount=1}
         },
-        result = 'gr_materials_white_data_item',
-        result_count = 1,
+        results = {{type="item", name='gr_materials_white_data_item', amount=1}},
         energy_required = 10,
         always_show_made_in = true
     },
@@ -529,11 +496,10 @@ data:extend({
         enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'gr_materials_white_data_item',2480},
-            {'gr_materials_grey_item',2}
+            {type="item", name="gr_materials_white_data_item", amount=2480},
+            {type="item", name="gr_materials_grey_item", amount=2}
         },
-        result = 'gr_materials_white_item',
-        result_count = 1,
+        results = {{type="item", name='gr_materials_white_item', amount=1}},
         energy_required = 100,
         always_show_made_in = true
     },
@@ -550,13 +516,12 @@ data:extend({
         enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'gr_materials_crushed_exotic_item',1},
-            {'gr_materials_stabilizer_item',1},
-            {'gr_materials_circuit',20},
-            {'fi_modules_base_item',10}
+            {type="item", name="gr_materials_crushed_exotic_item", amount=1},
+            {type="item", name="gr_materials_stabilizer_item", amount=1},
+            {type="item", name="gr_materials_circuit", amount=20},
+            {type="item", name="fi_modules_base_item", amount=10}
         },
-        result = 'gr_materials_data_item',
-        result_count = 1,
+        results = {{type="item", name='gr_materials_data_item', amount=1}},
         energy_required = 10,
         always_show_made_in = true
     },
@@ -566,12 +531,11 @@ data:extend({
         enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'gr_materials_data_item',3},
-            {'gr_materials_stack_up_item',1},
-            {'gr_materials_stack_down_item',1}
+            {type="item", name="gr_materials_data_item", amount=3},
+            {type="item", name="gr_materials_stack_up_item", amount=1},
+            {type="item", name="gr_materials_stack_down_item", amount=1}
         },
-        result = 'gr_materials_stacked_data_item',
-        result_count = 1,
+        results = {{type="item", name='gr_materials_stacked_data_item', amount=1}},
         energy_required = 10,
         always_show_made_in = true
     },
@@ -582,11 +546,10 @@ data:extend({
         enabled = false,
         category = 'gr_charger_category',
         ingredients = {
-            {'automation-science-pack',100},
-            {'gr_materials_stacked_data_item',1}
+            {type="item", name="automation-science-pack", amount=100},
+            {type="item", name="gr_materials_stacked_data_item", amount=1}
         },
-        result = 'gr_materials_red_pack_item',
-        result_count = 100,
+        results = {{type="item", name='gr_materials_red_pack_item', amount=100}},
         energy_required = 10,
         always_show_made_in = true
     },
@@ -596,11 +559,10 @@ data:extend({
         enabled = false,
         category = 'gr_charger_category',
         ingredients = {
-            {'logistic-science-pack',100},
-            {'gr_materials_stacked_data_item',1}
+            {type="item", name="logistic-science-pack", amount=100},
+            {type="item", name="gr_materials_stacked_data_item", amount=1}
         },
-        result = 'gr_materials_green_pack_item',
-        result_count = 100,
+        results = {{type="item", name='gr_materials_green_pack_item', amount=100}},
         energy_required = 10,
         always_show_made_in = true
     },
@@ -610,11 +572,10 @@ data:extend({
         enabled = false,
         category = 'gr_charger_category',
         ingredients = {
-            {'chemical-science-pack',100},
-            {'gr_materials_stacked_data_item',1}
+            {type="item", name="chemical-science-pack", amount=100},
+            {type="item", name="gr_materials_stacked_data_item", amount=1}
         },
-        result = 'gr_materials_blue_pack_item',
-        result_count = 100,
+        results = {{type="item", name='gr_materials_blue_pack_item', amount=100}},
         energy_required = 10,
         always_show_made_in = true
     },
@@ -624,11 +585,10 @@ data:extend({
         enabled = false,
         category = 'gr_charger_category',
         ingredients = {
-            {'production-science-pack',100},
-            {'gr_materials_stacked_data_item',1}
+            {type="item", name="production-science-pack", amount=100},
+            {type="item", name="gr_materials_stacked_data_item", amount=1}
         },
-        result = 'gr_materials_purple_pack_item',
-        result_count = 100,
+        results = {{type="item", name='gr_materials_purple_pack_item', amount=100}},
         energy_required = 10,
         always_show_made_in = true
     },
@@ -638,11 +598,10 @@ data:extend({
         enabled = false,
         category = 'gr_charger_category',
         ingredients = {
-            {'utility-science-pack',100},
-            {'gr_materials_stacked_data_item',1}
+            {type="item", name="utility-science-pack", amount=100},
+            {type="item", name="gr_materials_stacked_data_item", amount=1}
         },
-        result = 'gr_materials_yellow_pack_item',
-        result_count = 100,
+        results = {{type="item", name='gr_materials_yellow_pack_item', amount=100}},
         energy_required = 10,
         always_show_made_in = true
     },
@@ -652,11 +611,10 @@ data:extend({
         enabled = false,
         category = 'gr_charger_category',
         ingredients = {
-            {'space-science-pack',100},
-            {'gr_materials_stacked_data_item',1}
+            {type="item", name="space-science-pack", amount=100},
+            {type="item", name="gr_materials_stacked_data_item", amount=1}
         },
-        result = 'gr_materials_grey_pack_item',
-        result_count = 100,
+        results = {{type="item", name='gr_materials_grey_pack_item', amount=100}},
         energy_required = 10,
         always_show_made_in = true
     },
@@ -666,11 +624,10 @@ data:extend({
         enabled = false,
         category = 'gr_charger_category',
         ingredients = {
-            {'fu_space_probe_science_item',100},
-            {'gr_materials_stacked_data_item',1}
+            {type="item", name="fu_space_probe_science_item", amount=100},
+            {type="item", name="gr_materials_stacked_data_item", amount=1}
         },
-        result = 'gr_materials_white_pack_item',
-        result_count = 100,
+        results = {{type="item", name='gr_materials_white_pack_item', amount=100}},
         energy_required = 10,
         always_show_made_in = true
     },
@@ -679,13 +636,12 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'fu_space_probe_science_item',100},
-            {'low-density-structure',40},
-            {'gr_materials_fusion_cell_item',10},
-            {'discharge-defense-equipment',10}
+            {type="item", name="fu_space_probe_science_item", amount=100},
+            {type="item", name="low-density-structure", amount=40},
+            {type="item", name="gr_materials_fusion_cell_item", amount=10},
+            {type="item", name="discharge-defense-equipment", amount=10}
         },
-        result = 'gr_materials_charge_item',
-        result_count = 1,
+        results = {{type="item", name='gr_materials_charge_item', amount=1}},
         energy_required = 10,
     },
     {
@@ -693,10 +649,9 @@ data:extend({
         type = 'recipe',
         enabled = false,
         ingredients = {
-            {'gr_materials_fusion_cell_item',1}
+            {type="item", name="gr_materials_fusion_cell_item", amount=1}
         },
-        result = 'gr_materials_charge_remote',
-        result_count = 1,
+        results = {{type="item", name='gr_materials_charge_remote', amount=1}},
         energy_required = 10,
     },
 
diff --git a/248k_2/scripts/SE/data-final-fixes.lua b/248k_2/scripts/SE/data-final-fixes.lua
index e44f41a..b66a50f 100644
--- a/248k_2/scripts/SE/data-final-fixes.lua
+++ b/248k_2/scripts/SE/data-final-fixes.lua
@@ -7,25 +7,25 @@ table.insert(data.raw.lab["gr_lab_entity"].inputs, "se-deep-space-science-pack-1
 table.insert(data.raw.lab["gr_lab_entity"].inputs, "se-material-science-pack-2")
 table.insert(data.raw.lab["gr_lab_entity"].inputs, "se-rocket-science-pack")
 --se-energy-science-pack-1
-table.insert(data.raw.technology["fu_energy_tech"].unit.ingredients, {"se-energy-science-pack-1", 1})
-table.insert(data.raw.technology["fu_reactor_tech"].unit.ingredients, {"se-energy-science-pack-1", 1})
-table.insert(data.raw.technology["fu_tokamak_tech"].unit.ingredients, {"se-energy-science-pack-2", 1})
-table.insert(data.raw.technology["fu_star_engine_tech"].unit.ingredients, {"se-energy-science-pack-3", 1})
+table.insert(data.raw.technology["fu_energy_tech"].unit.ingredients, {type="item", name="se-energy-science-pack-1", amount=1})
+table.insert(data.raw.technology["fu_reactor_tech"].unit.ingredients, {type="item", name="se-energy-science-pack-1", amount=1})
+table.insert(data.raw.technology["fu_tokamak_tech"].unit.ingredients, {type="item", name="se-energy-science-pack-2", amount=1})
+table.insert(data.raw.technology["fu_star_engine_tech"].unit.ingredients, {type="item", name="se-energy-science-pack-3", amount=1})
 --se-energy-material-pack-1
-table.insert(data.raw.technology["fu_star_engine_copper_tech"].unit.ingredients, {"se-material-science-pack-1", 1})
-table.insert(data.raw.technology["fu_star_engine_iron_tech"].unit.ingredients, {"se-material-science-pack-1", 1})
-table.insert(data.raw.technology["fu_star_engine_sulfur_tech"].unit.ingredients, {"se-material-science-pack-1", 1})
+table.insert(data.raw.technology["fu_star_engine_copper_tech"].unit.ingredients, {type="item", name="se-material-science-pack-1", amount=1})
+table.insert(data.raw.technology["fu_star_engine_iron_tech"].unit.ingredients, {type="item", name="se-material-science-pack-1", amount=1})
+table.insert(data.raw.technology["fu_star_engine_sulfur_tech"].unit.ingredients, {type="item", name="se-material-science-pack-1", amount=1})
 --ki
-table.insert(data.raw.technology["fu_ki_plus_1_tech"].unit.ingredients, {"se-deep-space-science-pack-2", 1})
-table.insert(data.raw.technology["fu_ki_plus_2_tech"].unit.ingredients, {"se-deep-space-science-pack-4", 1})
-table.insert(data.raw.technology["el_ki_sup_2_tech"].unit.ingredients, {"se-energy-science-pack-1", 1})
-table.insert(data.raw.technology["el_ki_sup_3_tech"].unit.ingredients, {"se-energy-science-pack-2", 1})
-table.insert(data.raw.technology["el_ki_sup_4_tech"].unit.ingredients, {"se-energy-science-pack-3", 1})
+table.insert(data.raw.technology["fu_ki_plus_1_tech"].unit.ingredients, {type="item", name="se-deep-space-science-pack-2", amount=1})
+table.insert(data.raw.technology["fu_ki_plus_2_tech"].unit.ingredients, {type="item", name="se-deep-space-science-pack-4", amount=1})
+table.insert(data.raw.technology["el_ki_sup_2_tech"].unit.ingredients, {type="item", name="se-energy-science-pack-1", amount=1})
+table.insert(data.raw.technology["el_ki_sup_3_tech"].unit.ingredients, {type="item", name="se-energy-science-pack-2", amount=1})
+table.insert(data.raw.technology["el_ki_sup_4_tech"].unit.ingredients, {type="item", name="se-energy-science-pack-3", amount=1})
 
 --modules
-table.insert(data.raw.technology["fi_modules_4_tech"].unit.ingredients, {"se-deep-space-science-pack-2", 1})
-table.insert(data.raw.technology["fi_modules_5_tech"].unit.ingredients, {"se-deep-space-science-pack-3", 1})
-table.insert(data.raw.technology["fi_modules_6_tech"].unit.ingredients, {"se-deep-space-science-pack-4", 1})
+table.insert(data.raw.technology["fi_modules_4_tech"].unit.ingredients, {type="item", name="se-deep-space-science-pack-2", amount=1})
+table.insert(data.raw.technology["fi_modules_5_tech"].unit.ingredients, {type="item", name="se-deep-space-science-pack-3", amount=1})
+table.insert(data.raw.technology["fi_modules_6_tech"].unit.ingredients, {type="item", name="se-deep-space-science-pack-4", amount=1})
 
 
 data.raw.technology["gr_stage_tech"].prerequisites = {
diff --git a/248k_2/scripts/electronic/el_burner.lua b/248k_2/scripts/electronic/el_burner.lua
index 0d828e9..02abde4 100644
--- a/248k_2/scripts/electronic/el_burner.lua
+++ b/248k_2/scripts/electronic/el_burner.lua
@@ -1,7 +1,7 @@
 function make_burner_recipe(item)
     if string.find(item, "dummy") then return end -- fix for ElectricTrains crash
     local blank = {
-        name = 'fu_burn_oxygen_recipe',
+        name = "fu_burn_"..item.."_recipe",
         type = 'recipe',
         category = 'fu_burner_category',
         icon = '__248k_2__/ressources/elements/fu_oxygen.png',
@@ -9,23 +9,17 @@ function make_burner_recipe(item)
         enabled = true,
         hidden = true,
         ingredients = {
-            {type="item", name="blank", amount=1},
+            {type="item", name=item, amount=1},
         },
         results = {},
-        result_count = 1,
         energy_required = 0.1,
         always_show_made_in = true,
         subgroup = 'fu_item_subgroup_f',
     }
-    blank["name"] = "fu_burn_"..item.."_recipe"
-    blank["ingredients"] = {
-        {item,1}
-    }
-    if data.raw.item[item].icon then 
+    if data.raw.item[item].icon then
         blank["icon"] = data.raw.item[item].icon
         blank["icon_size"] = data.raw.item[item].icon_size
     end
-    --table.insert(data.raw.recipe, base)
     data:extend({blank})
 end
 
diff --git a/248k_2/scripts/gravitation/gr_make_white_hole_recipes.lua b/248k_2/scripts/gravitation/gr_make_white_hole_recipes.lua
index abd946f..bf80a0a 100644
--- a/248k_2/scripts/gravitation/gr_make_white_hole_recipes.lua
+++ b/248k_2/scripts/gravitation/gr_make_white_hole_recipes.lua
@@ -1,36 +1,28 @@
 function gr_make_white_hole_recipe(item)
-    local blank = {
-        name = 'blank',
-        type = 'recipe',
-        enabled = true,
-        hidden = true,
-        allow_as_intermediate = false,
-        category = 'gr_white_hole_category',
-        ingredients = {
-            {'blank',1}
-        },
-        result = 'blank',
-        result_count = 2,
-        energy_required = 10,
-    }
-    blank["name"] = "gr_white_hole_cycle_"..item.."_recipe"
-    blank["ingredients"] = {
-        {item,1}
-    }
-    blank["result"] = item
-
-    --table.insert(data.raw.recipe, base)
-    data:extend({blank})
+    data:extend({
+        {
+            name = "gr_white_hole_cycle_" .. item .. "_recipe",
+            type = 'recipe',
+            enabled = true,
+            hidden = true,
+            allow_as_intermediate = false,
+            category = 'gr_white_hole_category',
+            ingredients = {
+                { type = "item", name = item, amount = 1 }
+            },
+            results = { { type = "item", name = item, amount = 2 } },
+            energy_required = 10,
+        }
+    })
 end
 
 function gr_white_hole_recipe_generator()
     local items = data.raw.item
-    for i,v in pairs(items) do
+    for i, v in pairs(items) do
         if tonumber(data.raw.item[i].stack_size) > 1 then
             gr_make_white_hole_recipe(data.raw.item[i].name)
         end
     end
 end
 
-
-gr_white_hole_recipe_generator()
\ No newline at end of file
+gr_white_hole_recipe_generator()
diff --git a/248k_2/scripts/ind2/data-final-fixes.lua b/248k_2/scripts/ind2/data-final-fixes.lua
index 62cb217..ea0d98f 100644
--- a/248k_2/scripts/ind2/data-final-fixes.lua
+++ b/248k_2/scripts/ind2/data-final-fixes.lua
@@ -37,7 +37,6 @@ data:extend({
         results = {
             {type="item", name="stainless-ingot", amount=500},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
@@ -52,7 +51,6 @@ data:extend({
         results = {
             {type="item", name="invar-ingot", amount=500},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
@@ -67,7 +65,6 @@ data:extend({
         results = {
             {type="item", name="cupronickel-ingot", amount=500},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
@@ -82,7 +79,6 @@ data:extend({
         results = {
             {type="item", name="chromium-ingot", amount=500},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
@@ -97,7 +93,6 @@ data:extend({
         results = {
             {type="item", name="gold-ingot", amount=500},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
@@ -112,7 +107,6 @@ data:extend({
         results = {
             {type="item", name="tellurium-ingot", amount=500},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
diff --git a/248k_2/scripts/krastorio2/data-final-fixes.lua b/248k_2/scripts/krastorio2/data-final-fixes.lua
index 337dac8..354616e 100644
--- a/248k_2/scripts/krastorio2/data-final-fixes.lua
+++ b/248k_2/scripts/krastorio2/data-final-fixes.lua
@@ -11,11 +11,10 @@ data:extend({
         always_show_made_in = true,
         ingredients =
         {
-            {"fi_crushed_lithium_item", 10},
+            {type="item", name="fi_crushed_lithium_item", amount=10},
             {type="fluid", name="mineral-water", amount=100}
         },
-        result = "lithium-chloride",
-        result_count = 10,
+        results = {{type="item", name="lithium-chloride", amount=10}},
         category = "chemistry"
     },
     {
@@ -33,7 +32,6 @@ data:extend({
             {type="fluid", name="oxygen", amount=50},
             {type="item", name="fi_materials_gold", amount=1, probability=0.25},
         },
-        result_count = 1,
         energy_required = 5,
         subgroup = 'fu_item_subgroup_e',
         order = 'a-a',
@@ -54,7 +52,6 @@ data:extend({
             {type="fluid", name="oxygen", amount=100},
             {type="item", name="fi_materials_gold", amount=1, probability=0.55},
         },
-        result_count = 1,
         energy_required = 5,
         subgroup = 'fu_item_subgroup_e',
         order = 'a-a',
@@ -75,7 +72,6 @@ data:extend({
             {type="fluid", name="oxygen", amount=150},
             {type="item", name="fi_materials_gold", amount=1, probability=0.85},
         },
-        result_count = 1,
         energy_required = 5,
         subgroup = 'fu_item_subgroup_e',
         order = 'a-a',
@@ -93,7 +89,6 @@ data:extend({
         results = {
             {type="fluid", name="hydrogen", amount=1000},
         },
-        result_count = 1,
         energy_required = 5,
         subgroup = 'fu_item_subgroup_e',
         order = 'a-a',
@@ -111,7 +106,6 @@ data:extend({
         results = {
             {type="fluid", name="hydrogen", amount=1000, temperature=40},
         },
-        result_count = 1,
         energy_required = 1,
         subgroup = 'fu_item_subgroup_e',
         order = 'a-a',
@@ -130,7 +124,6 @@ data:extend({
             {type="fluid", name="hydrogen", amount=100, temperature=40},
             {type="fluid", name="oxygen", amount=50, temperature=40}
         },
-        result_count = 1,
         energy_required = 1,
         subgroup = 'fu_item_subgroup_e',
         order = 'a-a',
@@ -149,7 +142,6 @@ data:extend({
             {type="fluid", name="hydrogen", amount=200, temperature=40},
             {type="fluid", name="oxygen", amount=100, temperature=40}
         },
-        result_count = 1,
         energy_required = 1,
         subgroup = 'fu_item_subgroup_e',
         order = 'a-a',
@@ -168,7 +160,6 @@ data:extend({
             {type="fluid", name="hydrogen", amount=500, temperature=40},
             {type="fluid", name="oxygen", amount=150, temperature=40},
         },
-        result_count = 1,
         energy_required = 1,
         subgroup = 'fu_item_subgroup_e',
         order = 'a-a',
@@ -188,7 +179,6 @@ data:extend({
             {type="fluid", name="fu_deuterium", amount=10},
             {type="fluid", name="fu_tritium", amount=1}
         },
-        result_count = '0.5',
         energy_required = 100,
         always_show_made_in = true,
     },
@@ -206,7 +196,6 @@ data:extend({
             {type="fluid", name="fu_lead_fluid_cold", amount=50},
             {type="fluid", name="steam", amount=1000/2, temperature=415},
         },
-        result_count = 1,
         energy_required = 1,
         subgroup = 'fu_item_subgroup_e',
         order = 'b-a',
@@ -226,7 +215,6 @@ data:extend({
             {type="fluid", name="fu_lead_fluid_cold", amount=100},
             {type="fluid", name="steam", amount=1000/4, temperature=975},
         },
-        result_count = 1,
         energy_required = 1,
         subgroup = 'fu_item_subgroup_e',
         order = 'b-a',
@@ -244,7 +232,6 @@ data:extend({
         results = {
             {type="fluid", name="matter", amount=500},
         },
-        result_count = 1,
         energy_required = 1,
     },
     {
@@ -259,7 +246,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_deuterium", amount=4},
         },
-        result_count = 1,
         energy_required = 10,
         always_show_made_in = true,
     },
@@ -275,7 +261,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_tritium", amount=10},
         },
-        result_count = 1,
         energy_required = 10,
         always_show_made_in = true,
     },
@@ -295,12 +280,10 @@ data:extend({
             {type="item", name="fu_exchanger_item", amount=10},
             {type="item", name="fu_tech_sign_item", amount=100},
             {type="item", name="fu_boiler_item", amount=10},
-            --{type="item", name="fu_burner_item", amount=10},
         },
         results = {
             {type="item", name="fu_ki_core_item", amount=1},
         },
-        result_count = 1,
         energy_required = 60,
     },
     {
@@ -363,34 +346,11 @@ data.raw.recipe["fi_crack_acid_gas_recipe"].ingredients = {
 
 --techs
 table.insert(data.raw.technology["kr-lithium-processing"].effects, {type ="unlock-recipe", recipe ="fi_lithium_to_k2"})
---table.insert(data.raw.technology["kr-matter-processing"].effects, {type ="unlock-recipe", recipe ="fu_star_engine_cooler_7_recipe"})
 if (not mods["RealisticFusionPower"]) then
     table.insert(data.raw.technology["kr-fusion-energy"].effects, {type ="unlock-recipe", recipe ="fu_activator_4_recipe"})
     table.insert(data.raw.technology["kr-fusion-energy"].effects, {type ="unlock-recipe", recipe ="fu_activator_3_recipe"})
 end
 
---[[
-table.insert(data.raw.technology["gr_stage_tech"].unit.ingredients, {"fu_space_probe_science_item", 1})
-table.insert(data.raw.technology["gr_train_tech"].unit.ingredients, {"fu_space_probe_science_item", 1})
-table.insert(data.raw.technology["gr_train_plus_tech"].unit.ingredients, {"fu_space_probe_science_item", 1})
-table.insert(data.raw.technology["gr_star_engine_1_tech"].unit.ingredients, {"fu_space_probe_science_item", 1})
-table.insert(data.raw.technology["gr_star_engine_2_tech"].unit.ingredients, {"fu_space_probe_science_item", 1})
-table.insert(data.raw.technology["gr_crafter_tech"].unit.ingredients, {"fu_space_probe_science_item", 1})
-table.insert(data.raw.technology["gr_materials_tech"].unit.ingredients, {"fu_space_probe_science_item", 1})
-table.insert(data.raw.technology["gr_compact_fusion_tech"].unit.ingredients, {"fu_space_probe_science_item", 1})
-table.insert(data.raw.technology["gr_charger_tech"].unit.ingredients, {"fu_space_probe_science_item", 1})
-table.insert(data.raw.technology["gr_kovarex_tech"].unit.ingredients, {"fu_space_probe_science_item", 1})
-table.insert(data.raw.technology["gr_black_hole_tech"].unit.ingredients, {"fu_space_probe_science_item", 1})
-table.insert(data.raw.technology["fi_modules_4_tech"].unit.ingredients, {"fu_space_probe_science_item", 1})
-table.insert(data.raw.technology["fi_modules_5_tech"].unit.ingredients, {"fu_space_probe_science_item", 1})
-table.insert(data.raw.technology["fi_modules_6_tech"].unit.ingredients, {"fu_space_probe_science_item", 1})
-
-table.insert(data.raw.technology["fu_ki_plus_1_tech"].unit.ingredients, {"fi_ki_science", 1})
-table.insert(data.raw.technology["fu_ki_plus_1_tech"].unit.ingredients, {"fu_ki_science", 1})
-table.insert(data.raw.technology["fu_ki_plus_2_tech"].unit.ingredients, {"fi_ki_science", 1})
-table.insert(data.raw.technology["fu_ki_plus_2_tech"].unit.ingredients, {"fu_ki_science", 1})
---]]
-
 table.insert(data.raw["generator-equipment"]["fi_train_equipment_generator_item"].categories,"vehicle-equipment")
 
 if (config("krastorio_endgame")) then
diff --git a/248k_2/scripts/krastorio2/overhaul.lua b/248k_2/scripts/krastorio2/overhaul.lua
index 2f34a86..3219bf4 100644
--- a/248k_2/scripts/krastorio2/overhaul.lua
+++ b/248k_2/scripts/krastorio2/overhaul.lua
@@ -71,14 +71,6 @@ local function remove_tech_card(tech, card)
         return
     end
 
-    --in data.raw
-    --[[
-    ingredients = {
-        {'automation-science-pack',1},
-        {'logistic-science-pack',1},
-    }
-    ]]
-
     for i,v in ipairs(data.raw.technology[tech].unit.ingredients) do
         for j,w in ipairs(v) do
             if w == card then
@@ -248,48 +240,46 @@ end
 --[BUILDINGS]
 
 building_table = {
-    {"kr-electrolysis-plant",           "el_materials_ALK", 10},
-    {"kr-filtration-plant",             "el_materials_ALK", 10},
-    --{"kr-electrolysis-plant",           "el_materials_ALK", 10},
-    --{"kr-electrolysis-plant",           "el_materials_ALK", 10},
-    {"kr-fluid-burner",                 "el_materials_ALK", 2},
-    {"kr-atmospheric-condensor",        "el_materials_ALK", 6},
-    {"el_solar_recipe",                   "solar-panel", 2},
-    {"solar-panel",                     "el_materials_ALK", 6},
-    {"kr-advanced-solar-panel",         "el_solar_item", 1},
-    {"kr-advanced-solar-panel",         "fi_materials_GFK", 2},
-    {"kr-fuel-refinery",                "el_materials_ALK", 4},
-    {"kr-gas-power-station",            "el_materials_ALK", 10},
+    {type="item", name="kr-electrolysis-plant",           "el_materials_ALK", amount=10},
+    {type="item", name="kr-filtration-plant",             "el_materials_ALK", amount=10},
+    {type="item", name="kr-fluid-burner",                 "el_materials_ALK", amount=2},
+    {type="item", name="kr-atmospheric-condensor",        "el_materials_ALK", amount=6},
+    {type="item", name="el_solar_recipe",                   "solar-panel", amount=2},
+    {type="item", name="solar-panel",                     "el_materials_ALK", amount=6},
+    {type="item", name="kr-advanced-solar-panel",         "el_solar_item", amount=1},
+    {type="item", name="kr-advanced-solar-panel",         "fi_materials_GFK", amount=2},
+    {type="item", name="kr-fuel-refinery",                "el_materials_ALK", amount=4},
+    {type="item", name="kr-gas-power-station",            "el_materials_ALK", amount=10},
 
-    {"buisart-lab",                     "fi_materials_NFK", 10},
-    {"kr-electric-mining-drill-mk2",    "fi_materials_GFK", 6},
-    {"kr-research-server",              "fi_materials_NFK", 8},
-    {"kr-research-server",              "fi_materials_GFK", 8},
-    {"kr-air-purifier",                 "fi_materials_NFK", 4},
-    {"kr-bio-lab",                      "fi_materials_NFK", 20},
-    {"kr-atmospheric-condensor",        "fi_materials_GFK", 4},
-    {"kr-fusion-reactor",               "fu_tech_sign_item",200},
-    {"fu_tokamak_reactor_recipe",         "kr-fusion-reactor",1},
-    {"kr-advanced-steam-turbine",       "fu_materials_KFK", 10},
+    {type="item", name="buisart-lab",                     "fi_materials_NFK", amount=10},
+    {type="item", name="kr-electric-mining-drill-mk2",    "fi_materials_GFK", amount=6},
+    {type="item", name="kr-research-server",              "fi_materials_NFK", amount=8},
+    {type="item", name="kr-research-server",              "fi_materials_GFK", amount=8},
+    {type="item", name="kr-air-purifier",                 "fi_materials_NFK", amount=4},
+    {type="item", name="kr-bio-lab",                      "fi_materials_NFK", amount=20},
+    {type="item", name="kr-atmospheric-condensor",        "fi_materials_GFK", amount=4},
+    {type="item", name="kr-fusion-reactor",               "fu_tech_sign_item", amount=200},
+    {type="item", name="fu_tokamak_reactor_recipe",         "kr-fusion-reactor", amount=1},
+    {type="item", name="kr-advanced-steam-turbine",       "fu_materials_KFK", amount=10},
     --logistics
-    {"kr-fast-loader",                  "el_materials_ALK", 4},
-    {"kr-express-loader",               "fi_materials_GFK", 4},
-    {"kr-advanced-transport-belt",      "fu_materials_KFK", 1},
-    {"kr-advanced-splitter",            "fu_materials_KFK", 3},
-    {"kr-advanced-loader",              "fu_materials_KFK", 4},
-    {"kr-advanced-underground-belt",    "fu_materials_KFK", 8},
+    {type="item", name="kr-fast-loader",                  "el_materials_ALK", amount=4},
+    {type="item", name="kr-express-loader",               "fi_materials_GFK", amount=4},
+    {type="item", name="kr-advanced-transport-belt",      "fu_materials_KFK", amount=1},
+    {type="item", name="kr-advanced-splitter",            "fu_materials_KFK", amount=3},
+    {type="item", name="kr-advanced-loader",              "fu_materials_KFK", amount=4},
+    {type="item", name="kr-advanced-underground-belt",    "fu_materials_KFK", amount=8},
 
-    {"kr-advanced-assembling-machine",  "fu_materials_KFK", 6},
-    {"kr-advanced-furnace",             "fu_materials_KFK", 6},
-    {"kr-advanced-chemical-plant",      "fu_materials_KFK", 6},
-    {"kr-matter-plant",                 "fu_materials_KFK", 12},
-    {"kr-matter-assembler",             "fu_materials_KFK", 8},
-    {"kr-stabilizer-charging-station",  "fu_materials_KFK", 6},
-    {"kr-large-roboport",               "fi_robo_port_item", 1},
-    {"kr-antimatter-reactor",           "fu_tokamak_reactor_item", 1},
-    {"kr-intergalactic-transceiver",    "fu_tokamak_reactor_item", 1},
-    {"kr-intergalactic-transceiver",    "gr_materials_magnet", 100},
-    {"kr-intergalactic-transceiver",    "gr_materials_fusion_cell_item", 10},
+    {type="item", name="kr-advanced-assembling-machine",  "fu_materials_KFK", amount=6},
+    {type="item", name="kr-advanced-furnace",             "fu_materials_KFK", amount=6},
+    {type="item", name="kr-advanced-chemical-plant",      "fu_materials_KFK", amount=6},
+    {type="item", name="kr-matter-plant",                 "fu_materials_KFK", amount=12},
+    {type="item", name="kr-matter-assembler",             "fu_materials_KFK", amount=8},
+    {type="item", name="kr-stabilizer-charging-station",  "fu_materials_KFK", amount=6},
+    {type="item", name="kr-large-roboport",               "fi_robo_port_item", amount=1},
+    {type="item", name="kr-antimatter-reactor",           "fu_tokamak_reactor_item", amount=1},
+    {type="item", name="kr-intergalactic-transceiver",    "fu_tokamak_reactor_item", amount=1},
+    {type="item", name="kr-intergalactic-transceiver",    "gr_materials_magnet", amount=100},
+    {type="item", name="kr-intergalactic-transceiver",    "gr_materials_fusion_cell_item", amount=10},
 
 
 }
@@ -297,33 +287,33 @@ building_table = {
 --[ITEMS]
 
 item_table = {
-    {"productivity-module-2",   "fi_modules_core_item", 1},
-    {"productivity-module-3",   "fi_modules_core_item", 3},
-    {"speed-module-2",          "fi_modules_core_item", 1},
-    {"speed-module-3",          "fi_modules_core_item", 3},
-    {"effectivity-module-2",    "fi_modules_core_item", 1},
-    {"effectivity-module-3",    "fi_modules_core_item", 3},
-    {"ai-core",                 "fu_materials_energy_crystal", 1},
-    {"fusion-reactor-equipment","fu_materials_energy_crystal", 25},
-    {"imersium-plate",          "fi_crushed_crystal_item", 4},
-    {"lithium-sulfur-battery",  "el_lithium_battery", 1},
-    {"empty-dt-fuel",           "fu_materials_KFK", 2},
-    {"fu_empty_container_recipe","empty-dt-fuel", 1},
-    {"energy-control-unit",     "fu_materials_energy_crystal", 1},
-    {"matter-stabilizer",       "fu_materials_empty_container", 1},
+    {type="item", name="productivity-module-2",   "fi_modules_core_item", amount=1},
+    {type="item", name="productivity-module-3",   "fi_modules_core_item", amount=3},
+    {type="item", name="speed-module-2",          "fi_modules_core_item", amount=1},
+    {type="item", name="speed-module-3",          "fi_modules_core_item", amount=3},
+    {type="item", name="effectivity-module-2",    "fi_modules_core_item", amount=1},
+    {type="item", name="effectivity-module-3",    "fi_modules_core_item", amount=3},
+    {type="item", name="ai-core",                 "fu_materials_energy_crystal", amount=1},
+    {type="item", name="fusion-reactor-equipment","fu_materials_energy_crystal", amount=25},
+    {type="item", name="imersium-plate",          "fi_crushed_crystal_item", amount=4},
+    {type="item", name="lithium-sulfur-battery",  "el_lithium_battery", amount=1},
+    {type="item", name="empty-dt-fuel",           "fu_materials_KFK", amount=2},
+    {type="item", name="fu_empty_container_recipe","empty-dt-fuel", amount=1},
+    {type="item", name="energy-control-unit",     "fu_materials_energy_crystal", amount=1},
+    {type="item", name="matter-stabilizer",       "fu_materials_empty_container", amount=1},
 
     --military
-    {"energy-shield-equipment", "el_energy_crystal_item", 5},
-    {"energy-shield-mk2-equipment","fi_energy_crystal_item", 5},
-    {"energy-shield-mk3-equipment","fu_materials_energy_crystal", 5},
-    {"battery-equipment",       "el_lithium_battery", 1},
+    {type="item", name="energy-shield-equipment", "el_energy_crystal_item", amount=5},
+    {type="item", name="energy-shield-mk2-equipment","fi_energy_crystal_item", amount=5},
+    {type="item", name="energy-shield-mk3-equipment","fu_materials_energy_crystal", amount=5},
+    {type="item", name="battery-equipment",       "el_lithium_battery", amount=1},
 
     --science
-    {"chemical-science-pack",        "el_energy_crystal_item",3},
-    {"production-science-pack",      "fi_materials_titan",  1},
-    {"utility-science-pack",         "fi_materials_neodym", 1},
-    {"matter-tech-card",             "fu_tech_sign_item", 5},
-    {"singularity-tech-card",        "gr_materials_magnet", 1},
+    {type="item", name="chemical-science-pack",        "el_energy_crystal_item", amount=3},
+    {type="item", name="production-science-pack",      "fi_materials_titan", amount=1},
+    {type="item", name="utility-science-pack",         "fi_materials_neodym", amount=1},
+    {type="item", name="matter-tech-card",             "fu_tech_sign_item", amount=5},
+    {type="item", name="singularity-tech-card",        "gr_materials_magnet", amount=1},
 }
 
 --[TECH]
@@ -397,8 +387,6 @@ tech_table = {
 --[ADD TECH CARDS]
 
 add_card_table = {
-    --{"el_purifier_tech",            "space-science-pack"},
-    
 }
 
 --[REMOVE TECH CARDS]
@@ -467,7 +455,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_tritium", amount=3},
         },
-        result_count = 1,
         energy_required = 1,
         always_show_made_in = true,
     },
@@ -484,7 +471,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_deuterium", amount=3},
         },
-        result_count = 1,
         energy_required = 10,
         always_show_made_in = true,
     },
@@ -500,7 +486,6 @@ data:extend({
         results = {
             {type="fluid", name="matter", amount=100},
         },
-        result_count = 1,
         energy_required = 1,
     },
 })
@@ -530,14 +515,14 @@ add_cards_to_tree(del_doubles(walk_techs("kr-singularity-tech-card", break_con))
 if mods["RealisticFusionPower"] then
     
     data.raw.recipe["fu_tokamak_reactor_recipe"].ingredients = {
-        {'fu_materials_magnet',200},
-        {'fu_materials_TIM',400},
-        {'fu_materials_KFK',400},
-        {'concrete',500},
-        {'fu_materials_energy_crystal',200},
-        {'pump',80},
-        {'processing-unit',500},
-        {'fu_tech_sign_item',2000},
+        {type="item", name="fu_materials_magnet", amount=200},
+        {type="item", name="fu_materials_TIM", amount=400},
+        {type="item", name="fu_materials_KFK", amount=400},
+        {type="item", name="concrete", amount=500},
+        {type="item", name="fu_materials_energy_crystal", amount=200},
+        {type="item", name="pump", amount=80},
+        {type="item", name="processing-unit", amount=500},
+        {type="item", name="fu_tech_sign_item", amount=2000},
     }
 
     data.raw.recipe["fu_empty_container_recipe"].ingredients = {
diff --git a/248k_2/scripts/overhaul.lua b/248k_2/scripts/overhaul.lua
index 3918e25..e99ecd5 100644
--- a/248k_2/scripts/overhaul.lua
+++ b/248k_2/scripts/overhaul.lua
@@ -62,58 +62,58 @@ end
 --[BUILDINGS]
 
 building_table = {
-    {"assembling-machine-2",    "el_materials_ALK", 3},
+    {type="item", name="assembling-machine-2",    "el_materials_ALK", amount=3},
     --
-    --{"fast-inserter",           "el_aluminum_item", 2},
-    --{"long-handed-inserter",    "el_aluminum_item", 2},
+    --{type="item", name="fast-inserter",           "el_aluminum_item", amount=2},
+    --{type="item", name="long-handed-inserter",    "el_aluminum_item", amount=2},
     --
-    {"engine-unit",             "el_materials_ALK", 3},
-    {"fast-transport-belt",     "el_materials_ALK", 1},
-    {"fast-splitter",           "el_materials_ALK", 3},
-    {"fast-underground-belt",   "el_materials_ALK", 8},
-    {"chemical-plant",          "el_materials_ALK", 6},
-    {"oil-refinery",            "el_materials_ALK", 6},
-    {"medium-electric-pole",    "el_materials_ALK", 2},
-    {"big-electric-pole",       "el_materials_ALK", 4},
+    {type="item", name="engine-unit",             "el_materials_ALK", amount=3},
+    {type="item", name="fast-transport-belt",     "el_materials_ALK", amount=1},
+    {type="item", name="fast-splitter",           "el_materials_ALK", amount=3},
+    {type="item", name="fast-underground-belt",   "el_materials_ALK", amount=8},
+    {type="item", name="chemical-plant",          "el_materials_ALK", amount=6},
+    {type="item", name="oil-refinery",            "el_materials_ALK", amount=6},
+    {type="item", name="medium-electric-pole",    "el_materials_ALK", amount=2},
+    {type="item", name="big-electric-pole",       "el_materials_ALK", amount=4},
 
-    {"stack-inserter",          "el_energy_crystal_item", 2},
+    {type="item", name="stack-inserter",          "el_energy_crystal_item", amount=2},
 
-    {"express-splitter",        "fi_materials_GFK", 3},
-    {"express-transport-belt",  "fi_materials_GFK", 1},
-    {"express-underground-belt","fi_materials_GFK", 8},
-    {"electric-furnace",        "fi_materials_GFK", 4},
-    {"centrifuge",              "fi_materials_GFK", 20},
-    {"steam-turbine",           "fi_materials_GFK", 15},
-    {"heat-exchanger",          "fi_materials_GFK", 10},
-    {"heat-pipe",               "fi_materials_titan",1},
+    {type="item", name="express-splitter",        "fi_materials_GFK", amount=3},
+    {type="item", name="express-transport-belt",  "fi_materials_GFK", amount=1},
+    {type="item", name="express-underground-belt","fi_materials_GFK", amount=8},
+    {type="item", name="electric-furnace",        "fi_materials_GFK", amount=4},
+    {type="item", name="centrifuge",              "fi_materials_GFK", amount=20},
+    {type="item", name="steam-turbine",           "fi_materials_GFK", amount=15},
+    {type="item", name="heat-exchanger",          "fi_materials_GFK", amount=10},
+    {type="item", name="heat-pipe",               "fi_materials_titan", amount=1},
 
-    --{"rocket-silo",             "fu_materials_KFK", 40},
+    --{type="item", name="rocket-silo",             "fu_materials_KFK", amount=40},
 
-    {"beacon",                  "fi_materials_titan",   8},
-    {"substation",              "fi_materials_titan",   4},
-    {"assembling-machine-3",    "fi_materials_titan",   4},
+    {type="item", name="beacon",                  "fi_materials_titan", amount=8},
+    {type="item", name="substation",              "fi_materials_titan", amount=4},
+    {type="item", name="assembling-machine-3",    "fi_materials_titan", amount=4},
 }
 
 --[ITEMS]
 
 item_table = {
-    {"advanced-circuit",        "el_materials_ceramic", 2},
-    {"processing-unit",         "fi_materials_gold",    3},
-    {"electric-engine-unit",    "fi_materials_gold",    3},
-    {"flying-robot-frame",      "fi_materials_neodym",  6},
-    {"productivity-module-2",   "fi_modules_core_item", 1},
-    {"productivity-module-3",   "fi_modules_core_item", 3},
-    {"speed-module-2",          "fi_modules_core_item", 1},
-    {"speed-module-3",          "fi_modules_core_item", 3},
-    {"effectivity-module-2",    "fi_modules_core_item", 1},
-    {"effectivity-module-3",    "fi_modules_core_item", 3},
-    --{"satellite",               "fu_materials_KFK",     10},
+    {type="item", name="advanced-circuit",        "el_materials_ceramic", amount=2},
+    {type="item", name="processing-unit",         "fi_materials_gold", amount=3},
+    {type="item", name="electric-engine-unit",    "fi_materials_gold", amount=3},
+    {type="item", name="flying-robot-frame",      "fi_materials_neodym", amount=6},
+    {type="item", name="productivity-module-2",   "fi_modules_core_item", amount=1},
+    {type="item", name="productivity-module-3",   "fi_modules_core_item", amount=3},
+    {type="item", name="speed-module-2",          "fi_modules_core_item", amount=1},
+    {type="item", name="speed-module-3",          "fi_modules_core_item", amount=3},
+    {type="item", name="effectivity-module-2",    "fi_modules_core_item", amount=1},
+    {type="item", name="effectivity-module-3",    "fi_modules_core_item", amount=3},
+    --{type="item", name="satellite",               "fu_materials_KFK", amount=10},
 
-    --{"automation-science-pack",    "fi_modules_core_item",  3},
-    --{"logistic-science-pack",      "fi_modules_core_item",  3},
-    {"chemical-science-pack",        "el_energy_crystal_item",2},
-    {"production-science-pack",      "fi_materials_titan",  3},
-    {"utility-science-pack",         "fi_materials_neodym", 3},
+    --{type="item", name="automation-science-pack",    "fi_modules_core_item", amount=3},
+    --{type="item", name="logistic-science-pack",      "fi_modules_core_item", amount=3},
+    {type="item", name="chemical-science-pack",        "el_energy_crystal_item", amount=2},
+    {type="item", name="production-science-pack",      "fi_materials_titan", amount=3},
+    {type="item", name="utility-science-pack",         "fi_materials_neodym", amount=3},
     
 }
 
@@ -183,7 +183,7 @@ add_to_techs(change_table_index(tech_table, tech_structure))
 -- if no space exploration mod
 if not mods["space-exploration"] then
     -- rocket silo and satellite
-    add_to_recipes(change_table_index({{"rocket-silo", "fu_materials_KFK", 40}, {"satellite", "fu_materials_KFK", 10}}, recipe_structure))
+    add_to_recipes(change_table_index({{type="item", name="rocket-silo", "fu_materials_KFK", 40}, {"satellite", "fu_materials_KFK", amount=10}}, recipe_structure))
     add_to_techs(change_table_index({{"rocket-silo", "fu_KFK_tech"}}, tech_structure))
 end
 
diff --git a/248k_2/scripts/realisticreactors/overhaul.lua b/248k_2/scripts/realisticreactors/overhaul.lua
index 75d19c2..98584e5 100644
--- a/248k_2/scripts/realisticreactors/overhaul.lua
+++ b/248k_2/scripts/realisticreactors/overhaul.lua
@@ -61,14 +61,6 @@ local function remove_tech_card(tech, card)
         return
     end
 
-    --in data.raw
-    --[[
-    ingredients = {
-        {'automation-science-pack',1},
-        {'logistic-science-pack',1},
-    }
-    ]]
-
     for i,v in ipairs(data.raw.technology[tech].unit.ingredients) do
         for j,w in ipairs(v) do
             if w == card then
@@ -140,16 +132,14 @@ end
 --[BUILDINGS]
 
 building_table = {
-    --{"kr-electrolysis-plant",           "el_materials_ALK", 10},
-
 }
 
 --[ITEMS]
 
 item_table = {
-    {"fi_train_equipment_generator_recipe",   "fi_tech_fuel", 10},
-    {"fi_equipment_player_reactor_recipe",    "fi_tech_fuel", 10},
-    {"fu_tech_sign_recipe",                   "fi_tech_fuel", 1},
+    {type="item", name="fi_train_equipment_generator_recipe",   "fi_tech_fuel", amount=10},
+    {type="item", name="fi_equipment_player_reactor_recipe",    "fi_tech_fuel", amount=10},
+    {type="item", name="fu_tech_sign_recipe",                   "fi_tech_fuel", amount=1},
     
 }
 
@@ -167,21 +157,16 @@ tech_table = {
 --[ADD TECH CARDS]
 
 add_card_table = {
-    --{"el_purifier_tech",            "space-science-pack"},
-    
 }
 
 --[REMOVE TECH CARDS]
 
 remove_card_table = {
-    --{"el_purifier_tech",            "logistic-science-pack"},
-    
 }
 
 --[REMOVE PREREQUISITES]
 
 pre_tech_table = {
-    --{"nuclear-power",            "effectivity-module-2"},
     {"nuclear-power",            "uranium-processing"},
     {"fi_energy_tech",           "nuclear-power"},
     {"fi_solid_reactor_tech",    "fi_refining_tech"},
@@ -234,11 +219,11 @@ table.insert(data.raw.technology["nuclear-power"].effects, {
 })
 
 data.raw.recipe["realistic-reactor"].ingredients = {
-    {"fi_solid_reactor_item", 1}, {"fi_tech_fuel", 20}, {"heat-pipe", 20}
+    {type="item", name="fi_solid_reactor_item", 1}, {"fi_tech_fuel", 20}, {"heat-pipe", amount=20}
 }
 
 data.raw.recipe["breeder-reactor"].ingredients = {
-    {"fi_solid_reactor_item", 1}, {"fi_tech_fuel", 40}, {"heat-pipe", 20}, {"productivity-module-3", 3}
+    {type="item", name="fi_solid_reactor_item", 1}, {"fi_tech_fuel", 40}, {"heat-pipe", 20}, {"productivity-module-3", amount=3}
 }
 
 data:extend({
@@ -279,11 +264,10 @@ data:extend({
         enabled = false,
         category = 'crafting',
         ingredients = {
-            {'uranium-238',2},
-            {'el_materials_ALK',5},
+            {type="item", name="uranium-238", amount=2},
+            {type="item", name="el_materials_ALK", amount=5},
         },
-        result = 'fi_test_fuel',
-        result_count = 1,
+        results = {{type="item", name='fi_test_fuel', amount=1}},
         energy_required = 2,
         order = 'b-b',
     },
@@ -293,12 +277,11 @@ data:extend({
         enabled = false,
         category = 'crafting',
         ingredients = {
-            {'fi_test_used_fuel', 1},
-            {'chemical-science-pack', 2},
-            {'uranium-238', 2},
+            {type="item", name="fi_test_used_fuel", amount=1},
+            {type="item", name="chemical-science-pack", amount=2},
+            {type="item", name="uranium-238", amount=2},
         },
-        result = 'fi_tech_fuel',
-        result_count = 1,
+        results = {{type="item", name='fi_tech_fuel', amount=1}},
         energy_required = 1,
         order = 'b-b',
     },
@@ -308,10 +291,9 @@ data:extend({
         enabled = false,
         category = 'fi_test_fuel_crafting_category',
         ingredients = {
-            {'fi_test_fuel', 1}
+            {type="item", name="fi_test_fuel", amount=1}
         },
-        result = 'fi_test_used_fuel',
-        result_count = 1,
+        results = {{type="item", name='fi_test_used_fuel', amount=1}},
         energy_required = 5,
         order = 'b-b',
         hidden = true,
@@ -339,8 +321,8 @@ data:extend({
         unit = {
             count = '500',
             ingredients = {
-                {'chemical-science-pack',1},
-                {'automation-science-pack',1},
+                {type="item", name="chemical-science-pack", amount=1},
+                {type="item", name="automation-science-pack", amount=1},
                 {'logistic-science-pack',1,},
             },
             time = 30,
@@ -359,7 +341,7 @@ data:extend({
         map_color = {r=0, g=0, b=1, a=1},
         minable = {
             mining_time = 1,
-            result = 'fi_solid_reactor_item',
+            results = {{type="item", name='fi_solid_reactor_item', amount=1}},
         },
         fixed_recipe = 'fi_use_tech_fuel_recipe',
         crafting_categories = {"fi_test_fuel_crafting_category"},
diff --git a/248k_2/scripts/umr/data.lua b/248k_2/scripts/umr/data.lua
index c871c11..f27b94d 100644
--- a/248k_2/scripts/umr/data.lua
+++ b/248k_2/scripts/umr/data.lua
@@ -65,8 +65,7 @@ data:extend({
             {type="fluid", name="fu_lithium_6", amount=100},
             {type="fluid", name="fu_helium_3", amount=100},
         },
-        result = 'fu_materials_fusion_card',
-        result_count = 100,
+        results = {{type="item", name='fu_materials_fusion_card', amount=100}},
         energy_required = 100,
         always_show_made_in = true,
     },
@@ -79,8 +78,7 @@ data:extend({
             {type="fluid", name="fu_deuterium", amount=100},
             {type="fluid", name="fu_helium_3", amount=100},
         },
-        result = 'fu_materials_fusion_card',
-        result_count = 20,
+        results = {{type="item", name='fu_materials_fusion_card', amount=20}},
         energy_required = 100,
         always_show_made_in = true,
     },