diff --git a/Gehauese.scad b/Gehauese.scad
index ac4537868929248b09631e28e317667423b0e529..f9446d77fdfc2753827747fd71ce8a86381d7d91 100644
--- a/Gehauese.scad
+++ b/Gehauese.scad
@@ -143,15 +143,15 @@ module touchscreen(x, y, z) {
         // PCB
         translate([x+0, y+0, z+0]) 
         color([0.03137, 0.2784, 0.5529], 1.0) 
-        cube([85, 55, 1.5]);
+        cube([85.06, 56.21, 1.5]);
         
         // Middlelayer
-        translate([x+1.5, y+0, z+1.5]) 
+        translate([x+1.28, y+1.105, z+1.5]) 
         color([0.95, 0.95, 0.95], 1.0) 
         cube([82.5, 54, 3.5]);
         
         // Display
-        translate([x+1.5, y+0, z+5]) 
+        translate([x+1.28, y+1.105, z+5]) 
         color([0.15, 0.15, 0.15], 1.0) 
         cube([82.5, 54, 1]);
         
@@ -180,12 +180,12 @@ module camera(x, y, z) {
                  translate([x+19, y+19, z-5.1]) 
                 color([0.3, 0.3, 0.3]) 
                 rotate([0, 0, 90])              
-                cylinder(10.2, 18, 18,$fn=50, true);
+                cylinder(10.2, 17, 17,$fn=50, true);
                 
                 translate([x+19, y+19, z-10.8]) 
                 color([0.3, 0.3, 0.3]) 
                 rotate([0, 0, 90])               
-                cylinder(1.2, 19, 19,$fn=50, true);
+                cylinder(1.2, 18, 18,$fn=50, true);
                 
                 translate([x+19, y+19, z-13]) 
                 color([0.3, 0.3, 0.3]) 
@@ -217,9 +217,9 @@ module camera(x, y, z) {
                 cylinder(1.6, 2.5, 2.5,$fn=50, true);
                 
                 // Stativ
-                translate([x+12, y-11, z-10]) 
+                translate([x+12, y-11, z-10.2]) 
                 color([0.3, 0.3, 0.3], 1) 
-                cube([14, 12, 11]);
+                cube([14, 15, 11]);
             }
             // Mounting-hole1
             translate([x+4, y+4, z+0.75]) 
@@ -262,6 +262,9 @@ module camera(x, y, z) {
 /*----------- Parts of Raspberry Pi case -------------*/
 
 module fan_frame(x, y, z) {
+    x = x-7.5;
+    y = y+16;
+    
     vis = 0.5;
     difference() {
         //Body
@@ -395,16 +398,21 @@ module screwcylinder(x, y, z, visibility) {
 module case_left_side(x, y, z, visibility) {
     difference() {
         union() {
-            
             difference() {
                 translate([x, y, z]) 
                 color([0.4, 0.4, 0.4], visibility) 
                 cube([2, 62, 28.5]);
                 
                 /*Ventilatoranpassung begin*/
-                translate([x+2.5, y+31, z+13])
+                // translate([x+2.5, y+31, z+13])
+                translate([x+1.6, y+31, z+13])
                 rotate([0, 90, 0])
                 cylinder(3, 14, 14, true);
+                
+                // Bohrung Anschluss Lüfter
+                translate([x+1, y+18, z+5.2])
+                rotate([0, 90, 0])
+                cylinder(4, 1.6, 1.6, true);
                 /*Ventilaoranpassung end*/
                 
                 /*Luftschlitze*/
@@ -459,7 +467,6 @@ module case_left_side(x, y, z, visibility) {
             color([0.4, 0.4, 0.4], visibility)
             cylinder(2, 13, 13, true);
             /*Ventilatoranpassung end*/
-            
         }
         //difference
         /*Ventilatoranpassung begin*/
@@ -480,6 +487,23 @@ module case_left_side(x, y, z, visibility) {
         cylinder(5.5, 1.25, 1.25, true);
         /*Ventilatoranpassung end*/
         
+        difference() {
+            //Nut für Deckel
+            translate([x+1, y+1, z+26.5])
+            cube([2, 60, 2.5]);
+                
+            //Nut für Deckel
+            translate([x+2, y+19, z+25])
+            rotate([0, 90, 0])
+            cylinder(3, 2.9, 2.9, true);
+            
+            //Nut für Deckel
+            translate([x+2, y+43, z+25])
+            rotate([0, 90, 0])
+            cylinder(3, 2.9, 2.9, true);
+                
+            }
+        
         /*Luftschlitze*/
     }
 }
@@ -491,6 +515,10 @@ module case_right_side(x, y, z, visibility) {
             translate([x-0.5, y+3.6, z+6]) cube([3,          15.75, 17]);
             translate([x-0.5, y+21.5, z+6]) cube([3,          15.75, 17]);
             translate([x-0.5, y+40, z+6]) cube([3, 17,          14.5]);
+            
+            //Nut für Deckel
+            translate([x-1, y+1, z+26.5])
+            cube([2, 60, 2.5]);
         }
     }
 }
@@ -517,6 +545,9 @@ module case_back_side(x, y, z, visibility) {
             translate([x+47.5+(i*3), y-0.5, z+15])
             cube([2, 3, 2]);
         }
+        //Nut für Deckel
+        translate([x+1, y-1, z+26.5])
+        cube([93, 2, 3]);
     }
 }
 
@@ -527,6 +558,19 @@ module case_front_side(x, y, z, visibility) {
             color([0.4, 0.4, 0.4], visibility) 
             cube([95, 2, 28.5]);
             
+            //Nut für Deckel
+            translate([x+1, y+1, z+26.5])
+            cube([94, 2, 2]);
+            
+            // Rahmenaussparung (AUX) zum erleichterten Einlegen des RPi
+            translate([x+54, y+1, z+2])
+            cube([14, 1.8, 27]);
+            
+            // Rahmenaussparung (USB/HDMI) zum erleichterten Einlegen 
+            // des RPi
+            translate([x+12, y+1.5, z+2])
+            cube([42.5, 1.8, 27]);
+            
             // Aux-hole
             translate([x+61, y-0.2, z+10])
             rotate([0, 90, 90]) 
@@ -559,6 +603,9 @@ module case_front_side(x, y, z, visibility) {
         
         rotate([0, 0, 0]) 
         case_raspberryPi_screwcylinder(x+90, y-1, z+23.5, visibility);
+        
+        
+        
     }
 }
 
@@ -654,16 +701,17 @@ module case_camera_ground_plate(x, y, z, visibility) {
 }
 
 module case_camera_left_side(x, y, z, visibility) {
-    translate([x, y, z]) 
+    translate([x, y, z+2]) 
     color([0.4, 0.4, 0.4], visibility) 
-    cube([2, 62, 20]);
+    cube([2, 62, 18]);
 }
 
 module case_camera_front_side(x, y, z, visibility) {
     difference() {
-        translate([x, y, z]) 
+        translate([x, y, z+2]) 
         color([0.4, 0.4, 0.4], visibility) 
-        cube([95, 2, 20]);
+        //cube([93, 2, 20]);
+        cube([95, 2, 18]);
         
         translate([x+41.5, y-0.5, z-0.1]) 
         cube([15, 3, 13.1]);
@@ -671,15 +719,15 @@ module case_camera_front_side(x, y, z, visibility) {
 }
 
 module case_camera_right_side(x, y, z, visibility) {
-    translate([x, y, z]) 
+    translate([x, y, z+2]) 
     color([0.4, 0.4, 0.4], visibility) 
-    cube([2, 62, 20]);
+    cube([2, 62, 18]);
 }
 
 module case_camera_back_side(x, y, z, visibility) {
-    translate([x, y, z]) 
+    translate([x, y, z+2]) 
     color([0.4, 0.4, 0.4], visibility) 
-    cube([95, 2, 20]);
+    cube([95, 2, 18]);
 }
 
 module case_camera_top_side(x, y, z, visibility) {
@@ -689,8 +737,10 @@ module case_camera_top_side(x, y, z, visibility) {
             color([0.4, 0.4, 0.4], visibility) 
             cube([95, 62, 2]);
             
-            translate([x+49, y+29, z-1]) 
-            cylinder(3, 16, 16, true);
+            //translate([x+49, y+29, z-1])
+            //cylinder(3, 16, 16, true);
+            translate([x+49, y+28, z-1]) 
+            cylinder(3, 18.5, 18.5, true);
             
             translate([x+5, y+28, z+1]) 
             cylinder(10, 1.3, 1.3, true);
@@ -703,7 +753,14 @@ module case_camera_top_side(x, y, z, visibility) {
             
             translate([x+90, y+5, z+1]) 
             cylinder(10, 1.3, 1.3, true);
+            
+            translate([x+41, y-1, z-1])
+            cube([16, 14, 6.5]);
+        
+            translate([x+36, y+5, z-1])
+            cube([26, 14, 6.5]);
         }
+        
         case_camera_top_side_edge(x, y, z, visibility);
         
     }
@@ -830,7 +887,7 @@ module case_camera_top_side_edge(x, y, z, visibility) {
         color([0.4, 0.4, 0.4], visibility) 
         cube([15, 3, 6]);
         
-        translate([x+41, y+2, z+1]) 
+        translate([x+41, y+2, z+0]) 
         color([0.4, 0.4, 0.4], visibility)
         cube([16, 3, 6]);
     }
@@ -862,9 +919,9 @@ module case_camera_screwcylinder1(x, y, z, visibility) {
 
 module case_camera_screwcylinder2(x, y, z, visibility) {
     difference(){
-        translate([x, y, z]) 
+        translate([x, y, z+1]) 
         color([0.4, 0.4, 0.4], visibility)
-        rotate([0, 0, 0]) cylinder(18, 3, 3, $fn=50, true);
+        rotate([0, 0, 0]) cylinder(16, 3, 3, $fn=50, true);
         
         translate([x, y, z-5]) 
         rotate([0, 0, 0]) 
@@ -888,47 +945,47 @@ module case_camera(x, y, z, visibility) {
         case_camera_screwcylinder2(x+5, y+57, z-11,          visibility);
         case_camera_screwcylinder2(x+5, y+28, z-11,          visibility);
         /* Additional material */
-        translate([x, y+25.5, z-20]) 
+        translate([x, y+25.5, z-18]) 
         color([0.4, 0.4, 0.4], visibility) 
-        cube([3.5, 5, 20]);
+        cube([3.5, 5, 18]);
         
-        translate([x+1, y+55, z-20]) 
+        translate([x+1, y+55, z-18]) 
         color([0.4, 0.4, 0.4], visibility) 
-        cube([2, 5, 20]);
+        cube([2, 5, 18]);
         
-        translate([x+2, y+59, z-20]) 
+        translate([x+2, y+59, z-18]) 
         color([0.4, 0.4, 0.4], visibility) 
-        cube([5, 2, 20]);
+        cube([5, 2, 18]);
         
-        translate([x+92, y+55, z-20]) 
+        translate([x+92, y+55, z-18]) 
         color([0.4, 0.4, 0.4], visibility) 
-        cube([2, 5, 20]);
+        cube([2, 5, 18]);
         
-        translate([x+89, y+59, z-20]) 
+        translate([x+89, y+59, z-18]) 
         color([0.4, 0.4, 0.4], visibility) 
-        cube([5, 2, 20]);
+        cube([5, 2, 18]);
         
-        translate([x+92, y+2, z-20]) 
+        translate([x+92, y+2, z-18]) 
         color([0.4, 0.4, 0.4], visibility) 
-        cube([2, 5, 20]);
+        cube([2, 5, 18]);
         
-        translate([x+89, y+1, z-20]) 
+        translate([x+89, y+1, z-18]) 
         color([0.4, 0.4, 0.4], visibility) 
-        cube([5, 2, 20]);
+        cube([5, 2, 18]);
     }
 }
 
 module case_camera_top(x, y, z, visibility) {
-    case_camera_top_side(x, y, z-20, visibility);
+    case_camera_top_side(x, y, z-18, visibility);
 }
 
 /*------------------- Assembling ------------------*/
-case_raspberryPi_top(0, 0, 0, 0.7);
-touchscreen(0, 0, 0);
-raspberryPi(0, 0, 0);
+//case_raspberryPi_top(0, 0, 5, 0.7);
+//touchscreen(0, 0, 0);
+//raspberryPi(0, 0, 0);
 case_raspberryPi(0, 0, 0, 0.7);
-case_camera(0, 0, 0, 0.7);
-camera(0, 0, 0);
-case_camera_top(0, 0, 0, 0.7);
-fan_frame(-7.5, 16, 0);
+//case_camera(0, 0, 0, 0.7);
+//camera(0, 0, 0);
+//case_camera_top(0, 0, 0, 0.7);
+//fan_frame(0, 0, 0);