diff --git a/case/case.scad b/case/case.scad
index 28b7e35..da7977d 100644
--- a/case/case.scad
+++ b/case/case.scad
@@ -91,9 +91,10 @@ module keyboard_base_plate(pcb_width, pcb_height) {
     }
     
     /* Upper right corner */
-    /*round_corner([thickness + pcb_clearance_edge + pcb_width,
-                  thickness + pcb_clearance_edge + pcb_height, 0],
-                 [90, 90, 90]);*/
+    round_corner([thickness + pcb_clearance_edge + pcb_width,
+                  thickness + pcb_clearance_edge + pcb_height,
+                 -thickness/2],
+                 [90, 90, 90]);
 
     /* Lower right corner */
     round_corner([    thickness + pcb_clearance_edge + pcb_width,
@@ -142,52 +143,60 @@ module keyboard_base_plate(pcb_width, pcb_height) {
                bottom_height);
 
     /* Upper right wall corner */
-    /*wall_corner([thickness + pcb_clearance_edge + pcb_width,
-                 thickness + pcb_clearance_edge + pcb_height, 0],
+    wall_corner([thickness + pcb_clearance_edge + pcb_width,
+                 thickness + pcb_clearance_edge + pcb_height,
+                -thickness/2],
                 [0, 0, 0],
                 corner_radius,
-                wall_height);*/
+                wall_height);
                 
     /* Lower right wall corner */
-    /*wall_corner([    thickness + pcb_clearance_edge + pcb_width,
-                 0 - thickness - pcb_clearance_edge, 0],
+    wall_corner([    thickness + pcb_clearance_edge + pcb_width,
+                 0 - thickness - pcb_clearance_edge,
+                    -thickness/2],
                 [0, 0, 270],
                 corner_radius,
-                wall_height);*/
+                wall_height);
 
     /* Lower left wall corner */
-    /*wall_corner([0 - thickness - pcb_clearance_edge,
-                 0 - thickness - pcb_clearance_edge, 0],
+    wall_corner([0 - thickness - pcb_clearance_edge,
+                 0 - thickness - pcb_clearance_edge,
+                    -thickness/2],
                 [0, 0, 180],
                 corner_radius,
-                wall_height);*/
+                wall_height);
                 
     /* Upper left wall corner */
-    /*wall_corner([0 - thickness - pcb_clearance_edge,
-                     thickness + pcb_clearance_edge + pcb_height, 0],
+    wall_corner([0 - thickness - pcb_clearance_edge,
+                     thickness + pcb_clearance_edge + pcb_height,
+                    -thickness/2],
                 [0, 0, 90],
                 corner_radius,
-                wall_height);*/
+                wall_height);
  
     /* Upper wall */
-    /*side([0 - thickness - pcb_clearance_edge,
-                          pcb_clearance_edge + pcb_height, 0],
-         [2 * thickness + pcb_width, thickness, wall_height]);*/
+    side([0 - thickness - pcb_clearance_edge,
+                          pcb_clearance_edge + pcb_height + corner_radius,
+             -thickness/2],
+         [bottom_width, thickness, wall_height]);
           
     /* Right wall */
-    /*side([     pcb_clearance_edge + pcb_width,
-          0 - thickness - pcb_clearance_edge, 0],
-         [thickness, 2 * thickness + pcb_height, wall_height]);*/
+    side([pcb_clearance_edge + pcb_width + corner_radius,
+          0 - thickness - pcb_clearance_edge,
+             -thickness/2],
+         [thickness, bottom_height, wall_height]);
           
     /* Lower wall */
-    /*side([0 - thickness - pcb_clearance_edge,
-          0 - thickness - pcb_clearance_edge, 0],
-         [2 * thickness + pcb_width, thickness, wall_height]);*/
+    side([0 - thickness - pcb_clearance_edge,
+          0 - thickness - pcb_clearance_edge - corner_radius,
+             -thickness/2],
+         [bottom_width, thickness, wall_height]);
           
     /* Left wall */
-    /*side([0 - thickness - pcb_clearance_edge,
-          0 - thickness - pcb_clearance_edge, 0],
-         [thickness, 2 * thickness + pcb_height, wall_height]);*/
+    side([0 - thickness - pcb_clearance_edge - corner_radius,
+          0 - thickness - pcb_clearance_edge,
+             -thickness/2],
+         [thickness, bottom_height, wall_height]);
 
     /* Bottom plate */
     side([0 - thickness - pcb_clearance_edge,
@@ -196,12 +205,12 @@ module keyboard_base_plate(pcb_width, pcb_height) {
          [bottom_width, bottom_height, thickness]);
           
     /* Screw holes */
-    /*for (screw_hole = screw_holes) {
+    for (screw_hole = screw_holes) {
         screw_post([screw_hole[0], screw_hole[1], 0],
                    pcb_clearance_bottom * 2,
                    pcb_screw_hole_diameter * 2,
                    pcb_screw_hole_diameter);
-    }*/
+    }
 }
 
 keyboard_base_plate(pcb_width, pcb_height);