diff --git a/merged/sections.yml b/merged/sections.yml
index ad94300..d48392d 100644
--- a/merged/sections.yml
+++ b/merged/sections.yml
@@ -2,16 +2,16 @@
 - :template: section_half_image
   :header: Makerspace
   :text: "Makerspace\r\n\r\nThe makers movement is transforming consumers into creaters.
-    By sharing otherwise expensive tools, it allows everyone to start exploring and
-    producing through otherwise inaccessible means.\r\nIn Finland this builds on the
-    traditional adult education and expands it into new technologies like electronics
-    and 3d printing.\r\nWe start with traditional tools that we know and have, like
-    woodworking, sowing, and metalworking. And we will expand into electronics and
-    3d technologies as funding starts coming. (See wish-list below if you want to
-    help)"
+    By sharing otherwise expensive tools, it allows us to start exploring and producing
+    through otherwise inaccessible means.\r\nIn Finland this builds on the traditional
+    adult education and expands it into new technologies like electronics and 3d printing.\r\n\r\nWe
+    have started with traditional tools that we know and have, like woodworking, sowing,
+    and metalworking. And expanded into electronics and 3d technologies, with more
+    tools coming all the time.\r\n\r\nCurrently a unified space is under contruction
+    and part of the tools are distributed throughout the house. But a lot exists already. "
   :image_name: makerspace
   :id: 1
-  :updated_at: 2022-12-23 21:41:12.945710728 +02:00
+  :updated_at: 2023-08-10 17:44:16.965482589 +03:00
   :page_id: 1
   :index: 1
   :options:
@@ -25,34 +25,13 @@
     button_text: ''
   :image_id: 20
   :updated_by: torsten@villataika.fi
-- :template: section_full_up
-  :id: 2
-  :header: Different workshops
-  :text: "Some of the machines, but all of the spaces described here exists. Also
-    courses for all the activities will be part of a shared future, and if you have
-    something to contribute (or teach) contact us.\r\nIf you want to use any of the
-    facilities, see below."
-  :options:
-    background: light_gray
-    text_color: black
-    margin: none
-    subheader: Sharing machines and experiences
-    button_link: ''
-    button_text: ''
-    text_align: center
-    item_align: center
-  :updated_at: 2022-12-23 21:41:38.729342222 +02:00
-  :page_id: 1
-  :index: 2
-  :image_id:
-  :updated_by: torsten@villataika.fi
 - :template: section_large_image
   :id: 3
   :header: 3D
-  :text: "We have 2 3d printers, one small, on large, to allow everyone to try to
-    bring their imagination to the physical world.\r\nAdditionally to hard and soft
-    plastics, 3d printers can be used to print aluminium and carbon fibre to produce
-    usable machine parts.\r\nComputers and software for designing are available."
+  :text: "We have three 3d printers,  small, medium and large, to allow everyone to
+    try to bring their imagination to the physical world.\r\n\r\nWe have converted
+    all printers to klipper software, for easy use, but powerful features.\r\n\r\nComputers
+    and software for designing are available."
   :options:
     subheader: Printing, scanning and planning
     order: left
@@ -60,18 +39,19 @@
     background: light_gray
     margin: none
   :image_name: 3dprinter_wide
-  :updated_at: &1 2022-12-09 17:56:51.141334688 +02:00
+  :updated_at: 2023-08-10 18:00:10.963770766 +03:00
   :page_id: 1
-  :index: 3
+  :index: 4
   :image_id: 1
+  :updated_by: torsten@villataika.fi
 - :template: section_large_image
   :id: 4
   :header: Clothes
-  :text: "The thrid floor makerspace already has some sowing machines and will get
-    more. We are sourcing industrial sawing and embroidering machines so no project
-    is too big (or small). The large rooms is set up for a shared working environment,
-    enabling knowledge to be shared easily.\r\nPrivate lockers make it easy to interrupt
-    and return to your project in your own time."
+  :text: "The fourth floor already has some four sowing machines We are sourcing industrial
+    sawing and embroidering machines so no project is too big (or small). The large
+    rooms is set up for a shared working environment, enabling knowledge to be shared
+    easily.\r\nPrivate lockers make it easy to interrupt and return to your project
+    in your own time."
   :image_name: sowing_wide
   :options:
     subheader: Express your style
@@ -79,18 +59,19 @@
     text_color: none
     background: light_gray
     margin: none
-  :updated_at: *1
+  :updated_at: 2023-08-10 18:01:11.159243643 +03:00
   :page_id: 1
-  :index: 4
+  :index: 6
   :image_id: 33
+  :updated_by: torsten@villataika.fi
 - :template: section_large_image
   :id: 5
   :header: Metal workshop and garage
-  :text: "The building has a garage workshop and we will move our metal workshop there.
-    There is a saw, drills, different welders (gas, stick, mig) and wrenches to allow
-    members to build the robot of their dreams, or fix their car.\r\nSmaller side
-    rooms allow for private and more detailed work, and we are looking to get a  lathe,
-    possibly also a cnc machine."
+  :text: "The building has a garage workshop (not as clean as the picture) and we
+    have moved our metal workshop there. There is a saw, drills, different welders
+    (gas, stick, tig) and wrenches to  build the robot of your dreams, or fix a car
+    (on the car lift).\r\n\r\nWe have also got a metal lathe and milling machine,
+    though they are not set up yet."
   :image_name: metal_wide
   :options:
     subheader: Useful and practical
@@ -98,10 +79,11 @@
     order: left
     text_color: none
     background: light_gray
-  :updated_at: *1
+  :updated_at: 2023-08-10 17:53:51.223572115 +03:00
   :page_id: 1
-  :index: 5
+  :index: 3
   :image_id: 23
+  :updated_by: torsten@villataika.fi
 - :template: section_large_image
   :id: 6
   :header: Electronics
@@ -116,16 +98,16 @@
     order: right
     text_color: none
     background: light_gray
-  :updated_at: *1
+  :updated_at: 2023-08-10 17:46:25.786150315 +03:00
   :page_id: 1
-  :index: 6
+  :index: 5
   :image_id: 11
+  :updated_by: torsten@villataika.fi
 - :template: section_large_image
   :id: 7
   :header: Clay
-  :text: Hub Feenix is looking to buy a clay oven, and set aside one or two wet spaces
-    for clay work. Both free form sculpturing and table turning facilities will be
-    available for hobbyists to try their hand at clay.
+  :text: "Hub Feenix also has a clay oven and a turning table. These are in two wet
+    spaces currently also in the fourth floor.\r\n"
   :image_name: clay_wide
   :options:
     subheader: Sculptured or turned
@@ -133,17 +115,20 @@
     order: left
     text_color: none
     background: light_gray
-  :updated_at: *1
+  :updated_at: 2023-08-10 18:02:09.601907114 +03:00
   :page_id: 1
   :index: 7
   :image_id: 3
+  :updated_by: torsten@villataika.fi
 - :template: section_large_image
   :id: 8
-  :header: Woodworking
-  :text: "We have a full woodworking workshop, we just need to move the machines to
-    Hub Feenix.\r\n\r\nWe will make this available to trained members on an hourly
-    basis much like nikkariverstas in Espoo.\r\n\r\nThe workshop will have all large
-    machines (as in the picture) and a separate hand tool for smaller projects."
+  :header: Woodworking and Saw
+  :text: "We have a full woodworking workshop, everything from hand tools to a small
+    saw-mill.\r\n\r\nThe space is around 300m2 and the outside area about 3000. We
+    have a big table saw, both planers, chops saws and hand tools to do just about
+    every project.\r\n\r\nWith the woodmizer saw mill we make beams and boards. And
+    since we have enough space we can dry some of that inside. Also we have started
+    to build a tiny-house and other structures for the hub. "
   :image_name: woodworking_wide
   :options:
     subheader: ''
@@ -151,10 +136,11 @@
     order: right
     text_color: none
     background: light_gray
-  :updated_at: *1
+  :updated_at: 2023-08-10 17:51:23.308241092 +03:00
   :page_id: 1
-  :index: 8
+  :index: 2
   :image_id: 40
+  :updated_by: torsten@villataika.fi
 - :template: form_section
   :id: 9
   :card_template: form_field
@@ -174,9 +160,9 @@
     handler: FormHandler
     background: light_orange
     text_color: solid_black
-  :updated_at: *1
+  :updated_at: 2022-12-09 17:56:51.141334688 +02:00
   :page_id: 1
-  :index: 9
+  :index: 8
   :image_id:
 - :template: section_half_image
   :id: 10
@@ -379,7 +365,7 @@
   :header: Common spaces
   :text: Enjoy the free time in between learning. Several common spaces, like in the
     picture, terraces and the cafe make a relaxed atmosphere.
-  :updated_at: &2 2022-12-09 17:32:41.538163009 +02:00
+  :updated_at: &1 2022-12-09 17:32:41.538163009 +02:00
   :page_id: 3
   :index: 7
   :image_id: 5
@@ -410,7 +396,7 @@
     order: left
     text_color: solid_blue
     background: light_orange
-  :updated_at: *2
+  :updated_at: *1
   :page_id: 3
   :index: 9
   :image_id: 24
@@ -425,7 +411,7 @@
     handler: FormHandler
     background: light_gray
     text_color: solid_blue
-  :updated_at: *2
+  :updated_at: *1
   :page_id: 3
   :index: 10
   :image_id:
@@ -562,7 +548,7 @@
   :updated_by: maijanposteja@gmail.com
 - :template: section_spacer
   :id: 32
-  :updated_at: &3 2022-12-10 20:28:17.967357225 +02:00
+  :updated_at: &2 2022-12-10 20:28:17.967357225 +02:00
   :page_id: 6
   :index: 2
   :options: {}
@@ -579,7 +565,7 @@
     background: solid_blue
   :image_name: retreats
   :id: 33
-  :updated_at: *3
+  :updated_at: *2
   :page_id: 6
   :index: 3
   :image_id: 27
@@ -612,7 +598,7 @@
     background: solid_blue
   :image_name: makerspace
   :id: 35
-  :updated_at: *3
+  :updated_at: *2
   :page_id: 6
   :index: 5
   :image_id: 20