diff --git a/PiZero.scad b/PiZero.scad
index 2232e62..10f718b 100644
--- a/PiZero.scad
+++ b/PiZero.scad
@@ -145,14 +145,14 @@ module PiZeroBody(extend_components = false) // Models the Pi.
 	// Now show the components    
 	PiComponent(PiSOC);		// Processor
 	PiComponent(PiSD, scaling=extend_components ? [2,1.1,1.3] : [1,1,1]);		// SD card holder
-	PiComponent(PiHDMI, scaling=extend_components ? [1.1,2.5,1.3] : [1,1,1]);	// HDMI
-	PiComponent(PiUSB, scaling=extend_components ? [1.1,2.5,1.3] : [1,1,1]);		// USB
-	PiComponent(PiOTG, scaling=extend_components ? [1.1,2.5,1.3] : [1,1,1]);		// Power
+	PiComponent(PiHDMI, scaling=extend_components ? [1.1,2.5,1.2] : [1,1,1]);	// HDMI
+	PiComponent(PiUSB, scaling=extend_components ? [1.2,2.5,1.3] : [1,1,1]);		// USB
+	PiComponent(PiOTG, scaling=extend_components ? [1.2,2.5,1.3] : [1,1,1]);		// Power
 	PiComponent(PiACT);		// Active LED
 	if (PiZeroVer != "1.2")	// Only 1.2 doesn't have camera header
 	{
-		PiComponent(PiCAMw, scaling=extend_components ? [3,1.1,1.3]  : [1,1,1]);
-		PiComponent(PiCAMb, scaling=extend_components ? [3,1.1,1.3] : [1,1,1]);
+		PiComponent(PiCAMw, scaling=extend_components ? [4,1.1,1.3]  : [1,1,1]);
+		PiComponent(PiCAMb, scaling=extend_components ? [4,1.1,1.3] : [1,1,1]);
 	}
 	if (isitPiW()) color("DarkGreen") translate([0,0,0.1]) linear_extrude(height=PiSizeZ) polygon(points=PiWiFi);		// Antenna
 }
diff --git a/pi-camera-case.scad b/pi-camera-case.scad
index 899c727..4aa0b0a 100644
--- a/pi-camera-case.scad
+++ b/pi-camera-case.scad
@@ -1,19 +1,21 @@
 include <PiZero.scad>
 include <BOSL2/std.scad>
 
-wall_thickness_mod = 2;
+CaseSizeX = PiSizeX + 1.5;
+CaseSizeY = PiSizeY + 1.5;
+wall_thickness_mod = 3;
 cap_thickness = 6;
 case_height = 7;
-outer_rect_size=[PiSizeX + wall_thickness_mod, PiSizeY + wall_thickness_mod];
+outer_rect_size=[CaseSizeX + wall_thickness_mod, CaseSizeY + wall_thickness_mod];
 PiZeroVer = "WH";
 
 %up(cap_thickness) PiZeroBody(false);
 union() {
   // Case Walls
 	up(cap_thickness - 0.05) difference() {
-		rect_tube(h=case_height, size=outer_rect_size , isize=[PiSizeX, PiSizeY], anchor=BOTTOM);
+		rect_tube(h=case_height, size=outer_rect_size , isize=[CaseSizeX, CaseSizeY], anchor=BOTTOM);
 		up(0.5) PiZeroBody(true);
-		up(2) fwd(PiSizeY / 2 + wall_thickness_mod / 2 - 0.29) right(PiSizeX / 2 - 6) xrot(90) text3d(text = "5V", size=3, font = "Hurmit Nerd Font", thickness = 0.3, anchor=FRONT+LEFT+BOTTOM);
+		up(2) fwd(CaseSizeY / 2 + wall_thickness_mod / 2 - 0.29) right(CaseSizeX / 2 - 6) xrot(90) text3d(text = "5V", size=3, font = "Hurmit Nerd Font", thickness = 0.3, anchor=FRONT+LEFT+BOTTOM);
 	}
 	// Bottom Wall Cap
 	linear_extrude(cap_thickness) rect(size = outer_rect_size, anchor = CENTER, spin = 0);