diff --git a/shapes2d.scad b/shapes2d.scad
index 981b5f1..7f1b2a0 100644
--- a/shapes2d.scad
+++ b/shapes2d.scad
@@ -116,7 +116,8 @@ module square(size=1, center, anchor, spin) {
 // Example(2D): Negative-Rounded Rect
 //   rect([40,30], rounding=-5);
 // Example(2D): Combined Rounded-Chamfered Rect with corner flips
-//     rect(chamfer = 0.25*[0,1,-1,0], rounding=.25*[1,0,0,-1], corner_flip = true);
+//   rect([1,1], chamfer = 0.25*[0,1,-1,0],
+//        rounding=.25*[1,0,0,-1], corner_flip = true, $fn=32);
 // Example(2D): Default "box" Anchors
 //   color("red") rect([40,30]);
 //   rect([40,30], rounding=10)
diff --git a/skin.scad b/skin.scad
index 53d2c4f..bce4e31 100644
--- a/skin.scad
+++ b/skin.scad
@@ -1237,7 +1237,7 @@ function spiral_sweep(poly, h, r, turns=1, taper, r1, r2, d, d1, d2, internal=fa
         ang_step = 360/sides,
         turns = abs(turns),
         lead_in1 = first_defined([lead_in1, lead_in]),
-        lead_in2 = first_defined([lead_in1, lead_in]),        
+        lead_in2 = first_defined([lead_in2, lead_in]),
         lead_in_ang1 =
                       let(
                            user_ang = first_defined([lead_in_ang1,lead_in_ang])
@@ -1253,7 +1253,7 @@ function spiral_sweep(poly, h, r, turns=1, taper, r1, r2, d, d1, d2, internal=fa
         minang = -max(0,lead_in_ang1),
         maxang = 360*turns + max(0,lead_in_ang2),
         cut_ang1 = minang+abs(lead_in_ang1),
-        cut_ang2 = maxang-abs(lead_in_ang1),        
+        cut_ang2 = maxang-abs(lead_in_ang2),        
         lead_in_shape1 = first_defined([lead_in_shape1, lead_in_shape, "default"]),
         lead_in_shape2 = first_defined([lead_in_shape2, lead_in_shape, "default"]),             
         lead_in_func1 = is_func(lead_in_shape1) ? lead_in_shape1