diff --git a/Content.Shared/_CP14/LockKey/SharedCP14LockKeySystem.cs b/Content.Shared/_CP14/LockKey/SharedCP14LockKeySystem.cs
index 1959924915..3739e49862 100644
--- a/Content.Shared/_CP14/LockKey/SharedCP14LockKeySystem.cs
+++ b/Content.Shared/_CP14/LockKey/SharedCP14LockKeySystem.cs
@@ -97,7 +97,7 @@ public sealed class SharedCP14LockKeySystem : EntitySystem
             if (keyComp.LockShape == null)
                 continue;
 
-            if (keyComp.LockShape.SequenceEqual(cp14LockComp.LockShape))
+            if (!keyComp.LockShape.SequenceEqual(cp14LockComp.LockShape))
                 continue;
 
             TryUseKeyOnLock(args.User,
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Keys/keyrings.yml b/Resources/Prototypes/_CP14/Entities/Objects/Keys/keyrings.yml
index 450f182c92..1c42c31f12 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Keys/keyrings.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/keyrings.yml
@@ -14,6 +14,11 @@
     - state: ring-0
       map: ["enum.StorageFillLayers.Fill"]
   - type: Appearance
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/_CP14/Items/key_drop.ogg
+      params:
+        variation: 0.05
   - type: StorageFillVisualizer
     maxFillLevels: 4
     fillBaseName: ring
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml
index 344486e8ac..d361f20c0a 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml
@@ -90,6 +90,9 @@
   - type: Icon
     sprite: _CP14/Structures/Furniture/Tables/wood.rsi
     state: frame
+  - type: Construction
+    graph: CP14TableWooden
+    node: CP14TableWoodenFrame
 
 - type: entity
   parent: CP14WoodenTableBase
@@ -137,7 +140,7 @@
     sprite: _CP14/Structures/Furniture/Tables/wood_counter.rsi
     state: full
   - type: Construction
-    graph: CP14TableWoodenCounter
+    graph: CP14TableWooden
     node: CP14TableWoodenCounter
 
 - type: entity
diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml
index e43e5e1132..ce2fb44100 100644
--- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml
@@ -6,13 +6,60 @@
       actions:
         - !type:DestroyEntity {}
       edges:
+        - to: CP14TableWoodenFrame
+          steps:
+            - material: CP14WoodenPlanks
+              amount: 1
+              doAfter: 1
+    
+    - node: CP14TableWoodenFrame
+      entity: CP14TableWoodenFrame
+      edges:
+        - to: start
+          steps:
+            - tool: Prying
+              doAfter: 1
+          completed:
+            - !type:SpawnPrototype
+              prototype: CP14WoodenPlanks1
+              amount: 1
         - to: CP14TableWooden
           steps:
-            - stackGroup: WoodenPlanks
-              amount: 3
-              doAfter: 2
+            - material: CP14WoodenPlanks
+              amount: 1
+              doAfter: 1
+    
     - node: CP14TableWooden
       entity: CP14TableWooden
+      edges:
+        - to: CP14TableWoodenFrame
+          steps:
+            - tool: Prying
+              doAfter: 1
+          completed:
+            - !type:SpawnPrototype
+              prototype: CP14WoodenPlanks1
+              amount: 1
+        - to: CP14TableWoodenCounter
+          steps:
+            - material: CP14WoodenPlanks
+              amount: 1
+              doAfter: 1
+
+    - node: CP14TableWoodenCounter
+      entity: CP14TableWoodenCounter
+      edges:
+        - to: CP14TableWooden
+          steps:
+            - tool: Prying
+              doAfter: 1
+          completed:
+            - !type:SpawnPrototype
+              prototype: CP14WoodenPlanks1
+              amount: 1
+
+
+
 
 - type: constructionGraph
   id: CP14TableWoodenRound
@@ -29,22 +76,6 @@
               doAfter: 2
     - node: CP14TableWoodenRound
       entity: CP14TableWoodenRound
-
-- type: constructionGraph
-  id: CP14TableWoodenCounter
-  start: start
-  graph:
-    - node: start
-      actions:
-        - !type:DestroyEntity {}
-      edges:
-        - to: CP14TableWoodenCounter
-          steps:
-            - stackGroup: WoodenPlanks
-              amount: 3
-              doAfter: 2
-    - node: CP14TableWoodenCounter
-      entity: CP14TableWoodenCounter
               
 - type: constructionGraph
   id: CP14Workbench
diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Roofs/roofs.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Roofs/roofs.yml
index 35630f3b2e..f00da18a7b 100644
--- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Roofs/roofs.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Roofs/roofs.yml
@@ -3,27 +3,51 @@
   start: start
   graph:
     - node: start
+      actions:
+        - !type:DestroyEntity {}
       edges:
         - to: CP14RoofWooden
           steps:
             - stackGroup: WoodenPlanks
-              amount: 2
+              amount: 1
               doAfter: 2
       
     - node: CP14RoofWooden
       entity: CP14RoofWooden
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: CP14WoodenPlanks1
+              amount: 1
+            - !type:DeleteEntity {}
+          steps:
+            - tool: Prying
+              doAfter: 2
 
 - type: constructionGraph
   id: CP14RoofStone
   start: start
   graph:
     - node: start
+      actions:
+        - !type:DestroyEntity {}
       edges:
         - to: CP14RoofStone
           steps:
             - material: CP14Stone
-              amount: 2
+              amount: 1
               doAfter: 2
       
     - node: CP14RoofStone
-      entity: CP14RoofStone
\ No newline at end of file
+      entity: CP14RoofStone
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: CP14Stone1
+              amount: 1
+            - !type:DeleteEntity {}
+          steps:
+            - tool: Prying
+              doAfter: 2
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml b/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml
index 25379ec207..d1cc7e52da 100644
--- a/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml
@@ -57,7 +57,7 @@
   name: wooden counter
   description: A simple table made of boards.
   id: CP14TableWoodenCounter
-  graph: CP14TableWoodenCounter
+  graph: CP14TableWooden
   startNode: start
   targetNode: CP14TableWoodenCounter
   category: construction-category-furniture