diff --git a/glyphs/common-shapes.aki b/glyphs/common-shapes.aki
index 02f76c9..2c46c78 100644
--- a/glyphs/common-shapes.aki
+++ b/glyphs/common-shapes.aki
@@ -422,8 +422,8 @@ define [LeftHook x y xextend] : glyph-construction
 		widths.lhs fine
 		flat [fallback xextend : x + 1] y
 		curl x y
-		archv
-		g4 (x - LeftHook.extension) (y - HOOKX)
+		archv 8
+		g4.down.end (x - LeftHook.extension) (y - HOOKX) [heading DOWNWARD]
 set LeftHook.extension [Math.max (WIDTH * 0.15) ([adviceBlackness 4.25] * 1.5)]
 
 define [HooktopLeftBar stroke bottom] : glyph-construction
@@ -455,9 +455,9 @@ define [HCurlyTail fine wide rinner left m1 _right x1 x2 y2] : glyph-constructio
 		flat left wide [heading RIGHTWARD]
 		curl m1 wide [heading RIGHTWARD]
 		archv 8
-		g4   right (wide + rinner) [widths.heading 0 fine UPWARD]
+		g4   right (wide + rinner - O / 2) [widths.heading 0 fine {.x (-CORRECTION_HX) .y ((wide - fine) / (wide + rinner * 2 - O))}]
 		arcvh 8 
-		g4   mid (wide + rinner * 2 - O) [heading LEFTWARD]
+		g4.left.mid   mid (wide + rinner * 2 - O) [heading LEFTWARD]
 		quadcontrols ((x1 - mid) / (x2 - mid)) 0 8
 		g4   x2 y2
 
diff --git a/glyphs/letters-unified-basic.aki b/glyphs/letters-unified-basic.aki
index 35f458b..10a2395 100644
--- a/glyphs/letters-unified-basic.aki
+++ b/glyphs/letters-unified-basic.aki
@@ -2886,11 +2886,11 @@ symbol-block 'Z'
 		include eMarks
 		
 		local fine : adviceBlackness 4
-		local x1 : mix (SB + STROKE) RIGHTSB 0.55
+		local rinner : Math.max (WIDTH * 0.05 * (WIDTH / XH)) (fine * 0.3)
 		local x2 : mix (SB + STROKE) RIGHTSB 0.3
+		local x1 : mix x2 (RIGHTSB - fine - rinner * 1.5) 0.45
 		local y2 : -XH * 0.2
-		local rinner : Math.max (WIDTH * 0.05) (fine * 0.3)
-		local m1 : RIGHTSB - fine / 2 - rinner + O
+		local m1 : RIGHTSB - fine / 2 - rinner * 1.5 + O
 		include : HCurlyTail fine STROKE rinner SB m1 (RIGHTSB + fine / 2) x1 x2 y2
 		
 		include glyphs.z
diff --git a/onegroup.mk b/onegroup.mk
index 7b299eb..26a7913 100644
--- a/onegroup.mk
+++ b/onegroup.mk
@@ -27,6 +27,7 @@ OUTPUTS = $(UPRIGHT) $(ITALIC)
 TARGETS = $(UPRIGHT) $(ITALIC) $(EXTUPRG) $(EXTITAL)
 MAPS    = $(subst .ttf,.charmap,$(TARGETS))
 
+
 FDTS    = $(subst .ttf,.fdt,$(subst $(OBJDIR)/,$(OBJDIR)/.pass0-,$(TARGETS)))
 SVG0    = $(subst .ttf,.svg,$(subst $(OBJDIR)/,$(OBJDIR)/.pass0-,$(TARGETS)))
 
@@ -131,7 +132,8 @@ $(TESTTTF) : $(TESTDIR)/%.ttf : $(OBJDIR)/%.ttf
 TESTWOFF = $(subst .ttf,.woff,$(TESTTTF))
 $(TESTWOFF) : $(TESTDIR)/%.woff : $(TESTDIR)/%.ttf
 	sfnt2woff $<
-TESTMAPS = $(subst $(OBJDIR)/,$(TESTDIR)/,$(MAPS))
+OUTMAPS    = $(subst .ttf,.charmap,$(OUTPUTS))
+TESTMAPS = $(subst $(OBJDIR)/,$(TESTDIR)/,$(OUTMAPS))
 $(TESTMAPS) : $(TESTDIR)/%.charmap : $(OBJDIR)/%.charmap
 	cp $< $@