diff --git a/CFTubes.scad b/CFTubes.scad
index 342dbef..a6880d0 100644
--- a/CFTubes.scad
+++ b/CFTubes.scad
@@ -202,7 +202,7 @@ module headpiece(string_spacing=18, string_margin=4.5, num_strings=3, target_nec
 }
 
 module ubass_tuner() {
-	d_thread = 11.0;
+	d_thread = 11.0 + 0.2;
 	d_collar = 13.8 + 0.2;  // Add some tolerance
 	max_thread = 5.0;  // thread to cover without the collar
 	w_tag = 19;
@@ -214,7 +214,7 @@ module ubass_tuner() {
 	d_screw = 2.0;  // As we will screw into this, probably don't need tolerance yet
 	screw_tab_min_w = 1.6;
 	screw_tab_min_thick = 2.0;
-	d_screw_tab = 5.2+0.4;  // Tolerance this though!
+	d_screw_tab = 5.2+0.6;  // Tolerance this though!
 	// back_of_thread_to_tab_tip = 20.7 + 0.1; // 17.1 measuring far hole end to hole end, 6.9 measuring close ends gives average of 12.0
 	middle_of_thread_to_tab_screw = 12.0; //back_of_thread_to_tab_tip - d_thread/2 - screw_tab_min_w;  == 13.7
 	echo(middle_of_thread_to_tab_screw);
@@ -239,14 +239,14 @@ module ubass_tuner() {
 			translate([-3.5,-2]) text(str(d_screw), size=2.5);
 			translate([  0, -4]) rotate(30) text(str(d_screw_tab), size=2.5);
 			translate([4.4, -7]) rotate(90) text(str(middle_of_thread_to_tab_screw), size=2.5);
-			translate([-9.5,-13.5]) text(str(d_thread), size=2.5);
-			translate([-12,-27]) text(str(d_peg_collar_max), size=2.5);
+			translate([-9.5,-18.5]) text(str(d_thread), size=2.5);
+			translate([-10,-27]) rotate(90) text(str(d_peg_collar_max), size=2.5);
 		}
 	}
 	translate([0,0,max_thread]) linear_extrude(10) difference() {
 		offset(4, 3) tuner_footprint();
 		tuner_footprint();
-		translate([0, -l_tag+d_screw_tab/2+back_of_peg_collar_to_end-d_peg_collar_max/2]) square([100, d_peg_collar_max], center=true);
+		translate([0, -l_tag+d_screw_tab/2+back_of_peg_collar_to_end-d_peg_collar_max/2-1]) square([100, d_peg_collar_max+0.3], center=true);
 	}
 
 	// This segfaults for no reason