diff --git a/changelog.txt b/changelog.txt
index a995bf8..127fe86 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,13 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.0.26
+Date: 07.06.2022
+  Features:
+    - added rocket fuel recipes from kerosene
+
+  Bugfixes:
+    - added upgradeability for solar panel and assembling machines
+    - fixed startup bug with new roboport prototype attribute
+---------------------------------------------------------------------------------------------------
 Version: 1.0.25
 Date: 01.06.2022
   Features:
diff --git a/prototypes/248k_techs.lua b/prototypes/248k_techs.lua
index f6c3057..c94ba43 100644
--- a/prototypes/248k_techs.lua
+++ b/prototypes/248k_techs.lua
@@ -1728,6 +1728,14 @@ data:extend({
                 type = 'unlock-recipe',
                 recipe = 'fi_solid_2_recipe',
             },
+            { 
+                type = 'unlock-recipe',
+                recipe = 'fi_rocket_fuel_1_recipe',
+            },
+            { 
+                type = 'unlock-recipe',
+                recipe = 'fi_rocket_fuel_2_recipe',
+            },
         },
         unit = {
             count = '100',
diff --git a/prototypes/electronic/el_solar.lua b/prototypes/electronic/el_solar.lua
index a1ba222..af0f061 100644
--- a/prototypes/electronic/el_solar.lua
+++ b/prototypes/electronic/el_solar.lua
@@ -54,14 +54,15 @@ data:extend({
         },
         max_health = 150,
         corpse = 'small-remnants',
-        collision_box = {{-1.4,-1.4},{1.4,1.4}},
-        selection_box = {{-1.5,-1.5},{1.5,1.5}},
+        collision_box = data.raw['solar-panel']['solar-panel'].collision_box,
+        selection_box = data.raw['solar-panel']['solar-panel'].selection_box,
         --energy
         energy_source = {
             type = 'electric',
             usage_priority = 'solar',
             input_flow_limit = '0W',
         },
+        fast_replaceable_group = 'solar-panel',
         production = solar_output(),
         --picture
         picture = {
@@ -73,3 +74,8 @@ data:extend({
         map_color = {r=1.7,g=1.7,b=1.7},
     },
 })
+
+if data.raw["solar-panel"]["solar-panel"] then
+    data.raw["solar-panel"]["solar-panel"].next_upgrade = "el_solar_entity"
+    data.raw["solar-panel"]["solar-panel"].fast_replaceable_group = "solar-panel"
+end
\ No newline at end of file
diff --git a/prototypes/fi_recipes.lua b/prototypes/fi_recipes.lua
index b4775b6..d604aae 100644
--- a/prototypes/fi_recipes.lua
+++ b/prototypes/fi_recipes.lua
@@ -1495,4 +1495,44 @@ data:extend({
         subgroup = 'fluid-recipes',
         order = 'b[fluid-chemistry]-e[solid-fuel-from-heavy-oil]-b',
     },
+    {
+        name = 'fi_rocket_fuel_2_recipe',
+        type = 'recipe',
+        enabled = 'false',
+        category = 'chemistry',
+        main_product = 'rocket-fuel',
+        icon = sprite('icons/fi_rocket_1.png'),
+        icon_size = 64,
+        ingredients = {
+            {type="fluid", name="el_desulfurized_kerosene", amount=30},
+            {type="item", name="solid-fuel", amount=10},
+        },
+        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',
+    },
+    {
+        name = 'fi_rocket_fuel_1_recipe',
+        type = 'recipe',
+        enabled = 'false',
+        category = 'chemistry',
+        main_product = 'rocket-fuel',
+        icon = sprite('icons/fi_rocket_2.png'),
+        icon_size = 64,
+        ingredients = {
+            {type="fluid", name="el_kerosene", amount=20},
+            {type="item", name="solid-fuel", amount=10},
+        },
+        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',
+    },
 })
\ No newline at end of file
diff --git a/prototypes/fission/fi_crafter.lua b/prototypes/fission/fi_crafter.lua
index ac42351..27fac61 100644
--- a/prototypes/fission/fi_crafter.lua
+++ b/prototypes/fission/fi_crafter.lua
@@ -33,13 +33,14 @@ data:extend({
         flags = {"player-creation","placeable-neutral"},
         max_health = 300,
         corpse = 'big-remnants',
-        collision_box = {{-1.4,-1.4},{1.4,1.4}},
-        selection_box = {{-1.5,-1.5},{1.5,1.5}},
+        collision_box = data.raw['assembling-machine']['assembling-machine-1'].collision_box,
+        selection_box = data.raw['assembling-machine']['assembling-machine-1'].selection_box,
         map_color = {r=0, g=0, b=1, a=1},
         minable = {
             mining_time = 1,
             result = 'fi_crafter_item',
         },
+        fast_replaceable_group = "assembling-machine",
         crafting_categories = {'advanced-crafting','crafting','smelting','fi_crafting_category'},
         crafting_speed = 3.5,
         energy_source = {
@@ -105,4 +106,6 @@ data:extend({
             apparent_volume = 0.7,
         },
     },
-})
\ No newline at end of file
+})
+
+data.raw['assembling-machine']['assembling-machine-3'].next_upgrade = 'fi_crafter_entity'
\ No newline at end of file
diff --git a/prototypes/gravitation/gr_crafter.lua b/prototypes/gravitation/gr_crafter.lua
index 863e85e..cd866d3 100644
--- a/prototypes/gravitation/gr_crafter.lua
+++ b/prototypes/gravitation/gr_crafter.lua
@@ -33,13 +33,14 @@ data:extend({
         flags = {"player-creation","placeable-neutral"},
         max_health = 300,
         corpse = 'big-remnants',
-        collision_box = {{-1.4,-1.4},{1.4,1.4}},
-        selection_box = {{-1.5,-1.5},{1.5,1.5}},
+        collision_box = data.raw['assembling-machine']['assembling-machine-1'].collision_box,
+        selection_box = data.raw['assembling-machine']['assembling-machine-1'].selection_box,
         map_color = {r=0, g=0, b=1, a=1},
         minable = {
             mining_time = 1,
             result = 'gr_crafter_item',
         },
+        fast_replaceable_group = "assembling-machine",
         crafting_categories = {'advanced-crafting','crafting','smelting','fi_crafting_category'},
         crafting_speed = 10,
         energy_source = {
@@ -100,4 +101,6 @@ data:extend({
             apparent_volume = 0.7,
         },
     },
-})
\ No newline at end of file
+})
+
+data.raw['assembling-machine']['fi_crafter_entity'].next_upgrade = 'gr_crafter_entity'
\ No newline at end of file
diff --git a/ressources/icons/fi_rocket_1.png b/ressources/icons/fi_rocket_1.png
new file mode 100644
index 0000000..61e7c56
Binary files /dev/null and b/ressources/icons/fi_rocket_1.png differ
diff --git a/ressources/icons/fi_rocket_2.png b/ressources/icons/fi_rocket_2.png
new file mode 100644
index 0000000..85a313c
Binary files /dev/null and b/ressources/icons/fi_rocket_2.png differ
diff --git a/scripts/krastorio2/overhaul.lua b/scripts/krastorio2/overhaul.lua
index 387f245..e8df803 100644
--- a/scripts/krastorio2/overhaul.lua
+++ b/scripts/krastorio2/overhaul.lua
@@ -410,7 +410,9 @@ pre_tech_table = {
 --                              changes in entities and other protypes 
 --===================================================================================================================
 
+data.raw["solar-panel"]["solar-panel"].next_upgrade = "el_solar_entity"
 data.raw["solar-panel"]["el_solar_entity"].production = "220kW"
+data.raw["solar-panel"]["el_solar_entity"].next_upgrade = "kr-advanced-solar-panel"
 data.raw["solar-panel"]["kr-advanced-solar-panel"].production = "480kW"
 data.raw.item["el_materials_ALK"].stack_size = 200
 data.raw.recipe["dt-fuel"].ingredients = {