diff --git a/gear-v3.scad b/gear-v3.scad
index 1b5aa62..4e85c32 100644
--- a/gear-v3.scad
+++ b/gear-v3.scad
@@ -80,8 +80,9 @@
 // Standard 16t gear: root_radius=6.8 outer_radius=7.9 (mm_per_tooth =~ 3.05 by root)
 // Standard 8t gear: root_radius=2.8 outer_radius=4.9 (mm_per_tooth =~ 3.05 by root)
 
-// Gear radius:
-//outer_radius = mm_per_tooth*(n_teeth/2+1)/3.1415926;
+// Formulas for gear radiuses:
+//outer_radius = mm_per_tooth*(n_teeth/2+1)/3.1415926 - clearance;
+//root_radius = mm_per_tooth*(n_teeth/2-1)/3.1415926;
 
 //-------------------------------------------
 // Overview of this file
@@ -106,16 +107,15 @@ translate([0, 0, 16])
 
 /* Planetary ring gear with both inner and outer 40 teeth */
 
-planetary_ring_gear(plane_height=1);
+//planetary_ring_gear(plane_height=1);
 
 /* 40-teeth planetary ring gear with clutch */
 
 //planetary_ring_gear_with_clutch();
 
-/* Standard-16-teeth-like clutch gear */
+/* Solid clutch gear, like standard 16-teeth */
 
-//clutchTeeth(); // has surface problem
-//clutchGear(32);
+clutchGear(32);
 
 /* Gear with clutch fully offset to one side */
 
@@ -559,12 +559,12 @@ module clutchGear(number_of_teeth) {
     difference() {
       union() {
         gear(thickness=3.7, mm_per_tooth=3.05, number_of_teeth=number_of_teeth, clearance = -0.1);
-        translate([0, 0, 1]) cylinder($fn=100, h=5.8-1, r=6.8);
+        translate([0, 0, 1]) cylinder($fn=number_of_teeth*2, h=5.8-1, r=6.8);
         translate([0, 0, -2]) cylinder($fn=number_of_teeth*2, h=2+1, r=3.7);
       }
       difference() {
         translate([0, 0, 1.8]) cylinder($fn=number_of_teeth*2, h=4.1, r=5.8);
-        translate([0, 0, 1.8]) cylinder($fn=number_of_teeth*2, h=4.1, r=3.3);
+        translate([0, 0, 1.7]) cylinder($fn=number_of_teeth*2, h=4.1+0.2, r=3.3);
       }
       translate([0, 0, -3]) cylinder($fn=number_of_teeth*2, h=10, r=2.5);
       translate([0, 0, -2.2]) cylinder($fn=number_of_teeth*2, h=1, r=3.1);
@@ -578,34 +578,15 @@ module clutchGear(number_of_teeth) {
 
 // Clutch: 0.7 from the top, 1.5 width, 1 thickness
 module clutchTeeth() {
-  polyhedron(
-    points=[
-      [5.8, -0.8, 1.8], // 5.8+0.1, 1.8-0.1, чтобы утопить
-      [5.8, 0.8, 1.8],
-      [4.8, -0.8, 1.8],
-      [4.8, 0.8, 1.8],
-      [5.8, 0, 5],
-      [4.8, 0, 5],
-    ],
-    faces=[
-      [0, 1, 2],
-      [2, 1, 3],
-      [0, 4, 1],
-      [0, 2, 4],
-      [4, 2, 5],
-      [3, 1, 4],
-      [4, 5, 3],
-      [2, 3, 5],
-    ]
-  );
-/*  translate([5.8, 0, 1.8])
+  translate([5.8+0.1, 0, 1.8-0.1])
   rotate([0, -90, 0])
-  linear_extrude(height = 1, center = false)
+  linear_extrude(height = 1+0.1, center = false)
     polygon([
-      [0, -0.8], // 5.8+0.1, 1.8-0.1, чтобы утопить
+      [0, -0.8],
       [0, 0.8],
-      [3.2, 0],
-    ]);*/
+      [3.2+0.1, 0.1],
+      [3.2+0.1, -0.1],
+    ]);
 }
 
 module myGear(n_teeth) {