diff --git a/SeaBlock_0.2.17/control.lua b/SeaBlock_0.2.17/control.lua
index 8ad0916..138890c 100644
--- a/SeaBlock_0.2.17/control.lua
+++ b/SeaBlock_0.2.17/control.lua
@@ -56,7 +56,7 @@ end)
 script.on_event(defines.events.on_player_created, function(e)
   local player = game.players[e.player_index]
   player.remove_item{name = 'burner-mining-drill', count = 1}
-  player.insert{name = 'iron-axe', count = 1}
+--  player.insert{name = 'iron-axe', count = 1}
 end)
 
 script.on_event(defines.events.on_chunk_generated, function(e)
@@ -116,11 +116,13 @@ end)
 script.on_event(defines.events.on_player_main_inventory_changed, function(e)
   local player = game.players[e.player_index]
   local inv = player.get_inventory(defines.inventory.player_main)
+  if inv then
   for k,v in pairs(global.unlocks) do
     if not player.force.technologies[v].researched and inv.get_item_count(k) > 0 then
       haveitem(player, k, false)
     end
   end
+  end
 end)
 
 script.on_init(init)
diff --git a/SeaBlock_0.2.17/data-final-fixes.lua b/SeaBlock_0.2.17/data-final-fixes.lua
index 8695258..3643e02 100644
--- a/SeaBlock_0.2.17/data-final-fixes.lua
+++ b/SeaBlock_0.2.17/data-final-fixes.lua
@@ -74,7 +74,7 @@ end
 -- then any recipe that uses an unobtainable item is removed
 local unobtainable = {}
 for _,v in ipairs({
-  --'raw-wood',
+  --'wood',
   --'solid-oil-residual',
   'coal',
   'coal-crushed',
@@ -299,6 +299,7 @@ data.raw['map-gen-presets']['default']['death-world'] = nil
 data.raw['map-gen-presets']['default']['death-world-marathon'] = nil
 data.raw['map-gen-presets']['default']['rail-world'] = nil
 data.raw['map-gen-presets']['default']['rich-resources'] = nil
+data.raw['map-gen-presets']['default']['ribbon-world'] = nil
 
 -- Spacemod updates
 require "SpaceMod-updates"
diff --git a/SeaBlock_0.2.17/data-updates.lua b/SeaBlock_0.2.17/data-updates.lua
index 22942b4..fedd5c6 100644
--- a/SeaBlock_0.2.17/data-updates.lua
+++ b/SeaBlock_0.2.17/data-updates.lua
@@ -185,7 +185,7 @@ data.raw['item-subgroup']['slag-processing'].order = "ab"
 -- Leave change in because slag-processing-2 unlocks ceramic filters, which are quite helpful.
 -- Also, having a source of silver (from crotinnum) early allows making resin/rubber
 for k,v in pairs(data.raw.technology['slag-processing-2'].unit.ingredients) do
-  if v[1] == 'science-pack-3' then
+  if v[1] == 'chemical-science-pack' then
     table.remove(data.raw.technology['slag-processing-2'].unit.ingredients, k)
     break
   end
@@ -194,7 +194,7 @@ end
 -- Red science level research for slag processing 1
 data.raw.technology['slag-processing-1'].unit = {
   count = 20,
-  ingredients = {{'science-pack-1', 1}},
+  ingredients = {{'automation-science-pack', 1}},
   time = 15
 }
 
@@ -612,8 +612,8 @@ end
 
 -- Green science is unlocked by automation-2. In case people are playing without S.C.T.
 if not data.raw.technology['sct-research-t2'] then
-  data.raw.recipe['science-pack-2'].enabled = false
-  table.insert(data.raw.technology['automation-2'].effects, {type = 'unlock-recipe', recipe = 'science-pack-2'})
+  data.raw.recipe['logistic-science-pack'].enabled = false
+  table.insert(data.raw.technology['automation-2'].effects, {type = 'unlock-recipe', recipe = 'logistic-science-pack'})
 end
 
 -- Make bio-wood-processing a startup tutorial tech
@@ -678,16 +678,16 @@ local function updatefuel(recipe, to, amount)
   data.raw.recipe[recipe].ingredients[2].amount = amount
 end
 -- heavy oil 100 * 2.7 / 45 = 6
-updatefuel('burn-heavy-oil', 'liquid-naphtha', 6)
+--updatefuel('burn-heavy-oil', 'liquid-naphtha', 6)
 
 -- methane, same as heavy oil
-updatefuel('burn-petroleum-gas', 'gas-methane', 6)
+--updatefuel('burn-petroleum-gas', 'gas-methane', 6)
 
 -- light oil 50 * 2.7 / 45 = 3
-updatefuel('burn-light-oil', 'liquid-fuel-oil', 3)
+--updatefuel('burn-light-oil', 'liquid-fuel-oil', 3)
 
 -- diesel, same as light oil
-data.raw.recipe['burn-diesel-fuel'].ingredients[2].amount = 3
+--data.raw.recipe['burn-diesel-fuel'].ingredients[2].amount = 3
 
 -- Remove some unusual fuel sources from oil burner
 lib.takeeffect('OilBurning', 'burn-glycerol')
diff --git a/SeaBlock_0.2.17/data.lua b/SeaBlock_0.2.17/data.lua
index 84a5351..6fd159d 100644
--- a/SeaBlock_0.2.17/data.lua
+++ b/SeaBlock_0.2.17/data.lua
@@ -18,8 +18,8 @@ end
 -- So use train-layer as a substitute player-layer
 data.raw.cliff['cliff'].collision_mask =
   {"object-layer", "train-layer", "not-colliding-with-itself"}
-data.raw.cliff['small-cliff'].collision_mask =
-  {"object-layer", "train-layer", "not-colliding-with-itself"}
+--data.raw.cliff['small-cliff'].collision_mask =
+--  {"object-layer", "train-layer", "not-colliding-with-itself"}
 
 local octaves = -3
 local persistence = 0.2
@@ -408,7 +408,7 @@ local function make_basis_noise_function(seed0,seed1,outscale0,inscale0)
     }
   end
 end
-
+--[[
 data.raw['noise-expression']['default-cliffiness'].expression =
   noise.define_noise_function(function(x, y, tile, map)
     local t = noise.clamp(tile.tier - 0.2, 0, 1) -- No cliffs in starting area
@@ -428,3 +428,4 @@ data.raw['noise-expression']['default-elevation'].expression =
   end)
 data.raw['noise-expression']['default-temperature'].expression =
   data.raw['noise-expression']['default-elevation'].expression
+]]--
diff --git a/SeaBlock_0.2.17/info.json b/SeaBlock_0.2.17/info.json
index 96c6233..d37f043 100644
--- a/SeaBlock_0.2.17/info.json
+++ b/SeaBlock_0.2.17/info.json
@@ -1,7 +1,7 @@
 {
   "name": "SeaBlock",
   "version": "0.2.17",
-  "factorio_version": "0.16",
+  "factorio_version": "0.17",
   "title": "Sea Block",
   "author": "Trainwreck",
   "homepage": "https://forums.factorio.com/viewtopic.php?t=43759",
diff --git a/SeaBlock_0.2.17/prototypes/technology.lua b/SeaBlock_0.2.17/prototypes/technology.lua
index b4e52c6..afda24a 100644
--- a/SeaBlock_0.2.17/prototypes/technology.lua
+++ b/SeaBlock_0.2.17/prototypes/technology.lua
@@ -5,7 +5,7 @@ data:extend({
   localised_name = {"item-name.angels-ore3-crushed"},
   icon = "__angelsrefining__/graphics/icons/angels-ore3-crushed.png",
   icon_size = 32,
-  flags = {"goes-to-main-inventory", "hidden"},
+  flags = {"hidden"},
   stack_size = 100,
   durability = 1
 },
@@ -15,7 +15,7 @@ data:extend({
   localised_name = {"item-name.basic-circuit-board"},
   icon = "__bobelectronics__/graphics/icons/basic-circuit-board.png",
   icon_size = 32,
-  flags = {"goes-to-main-inventory", "hidden"},
+  flags = {"hidden"},
   stack_size = 100,
   durability = 1
 },
@@ -25,7 +25,7 @@ data:extend({
   localised_name = {"item-name.algae-green"},
   icon = "__angelsbioprocessing__/graphics/icons/algae-green.png",
   icon_size = 32,
-  flags = {"goes-to-main-inventory", "hidden"},
+  flags = {"hidden"},
   stack_size = 100,
   durability = 1
 },
@@ -35,7 +35,7 @@ data:extend({
   localised_name = {"item-name.sulfur"},
   icon = "__angelspetrochem__/graphics/icons/solid-sulfur.png",
   icon_size = 32,
-  flags = {"goes-to-main-inventory", "hidden"},
+  flags = {"hidden"},
   stack_size = 100,
   durability = 1
 },
@@ -45,7 +45,7 @@ data:extend({
   localised_name = {"item-name.lab"},
   icon = "__base__/graphics/icons/lab.png",
   icon_size = 32,
-  flags = {"goes-to-main-inventory", "hidden"},
+  flags = {"hidden"},
   stack_size = 100,
   durability = 1
 },
@@ -86,7 +86,7 @@ data:extend({
     {type = "unlock-recipe", recipe = "copper-pipe-to-ground"},
     {type = "unlock-recipe", recipe = "iron-stick"},
     {type = "unlock-recipe", recipe = "iron-gear-wheel"},
-    {type = "unlock-recipe", recipe = "iron-axe"},
+--    {type = "unlock-recipe", recipe = "iron-axe"},
     {type = "unlock-recipe", recipe = "burner-inserter"}
   },
   prerequisites = {"sb-startup1"},
@@ -139,7 +139,7 @@ data:extend({
   icon = "__SeaBlock__/graphics/technology/lab.png",
   icon_size = 128,
   effects = {
-    {type = "unlock-recipe", recipe = "science-pack-1"}
+    {type = "unlock-recipe", recipe = "automation-science-pack"}
   },
   prerequisites = {"bio-wood-processing"},
   unit = {
@@ -151,11 +151,11 @@ data:extend({
 })
 
 data.raw.recipe['copper-pipe-to-ground'].enabled = false
-if data.raw.recipe['science-pack-1'].normal then
-  data.raw.recipe['science-pack-1'].normal.enabled = false
-  data.raw.recipe['science-pack-1'].expensive.enabled = false
+if data.raw.recipe['automation-science-pack'].normal then
+  data.raw.recipe['automation-science-pack'].normal.enabled = false
+  data.raw.recipe['automation-science-pack'].expensive.enabled = false
 else
-  data.raw.recipe['science-pack-1'].enabled = false
+  data.raw.recipe['automation-science-pack'].enabled = false
 end
 if data.raw.recipe['basic-transport-belt'] then
   table.insert(data.raw.technology['sb-startup2'].effects,