diff --git a/glyphs/autobuilds.patel b/glyphs/autobuilds.patel
index 0cf9329..47cd4e1 100644
--- a/glyphs/autobuilds.patel
+++ b/glyphs/autobuilds.patel
@@ -36,6 +36,15 @@ define customDecompositions (
 	."\u0244" "U\u0336"
 	."\u01E5" "g\u0336"
 	."\u01BB" "2\u0336"
+	."\u024E" "Y\u0336"
+	."\u024F" "y\u0336"
+	
+	."\u023A" "A\u0338"
+	."\u023B" "C\u0338"
+	."\u023C" "c\u0337"
+	."\u023E" "T\u0338"
+	."\u0246" "E\u0338"
+	."\u0247" "e\u0337"
 	
 	."\u0290" "z\u0322"
 	."\u0256" "d\u0322"
diff --git a/glyphs/latin-basic-capital.patel b/glyphs/latin-basic-capital.patel
index ea40f68..77f42bd 100644
--- a/glyphs/latin-basic-capital.patel
+++ b/glyphs/latin-basic-capital.patel
@@ -466,16 +466,15 @@ create-glyph 'Z' : glyph-construction {
 	
 	local cor 1.15
 	
-	include : create-stroke :.start-from SB CAP :.heads-to RIGHTWARD :.set-width 0 STROKE
-		:.line-to RIGHTSB CAP :.heads-to RIGHTWARD
-	include : create-stroke :.start-from SB 0 :.heads-to RIGHTWARD :.set-width STROKE 0
-		:.line-to RIGHTSB 0 :.heads-to RIGHTWARD
+	include : HBarTop SB RIGHTSB XH
 	
 	start-from SB STROKE
 	line-to [SB + STROKE * cor] STROKE
 	line-to RIGHTSB [CAP - STROKE]
 	line-to [RIGHTSB - STROKE * cor] [CAP - STROKE]
 	reverse-last
+	
+	include : HBarBottom SB RIGHTSB 0
 }
 
 ### J
diff --git a/glyphs/latin-basic-lower.patel b/glyphs/latin-basic-lower.patel
index ce53cad..cf88e54 100644
--- a/glyphs/latin-basic-lower.patel
+++ b/glyphs/latin-basic-lower.patel
@@ -110,7 +110,7 @@ create-glyph 'g' : glyph-construction {
 	line-to    MIDDLE  [XH - STROKE - O]
 	line-to    MIDDLE  XH
 	
-	set-anchor 'overlay' BASE MIDDLE [mix [DESCENDER + O] groundy 0.53]
+	set-anchor 'overlay' BASE MIDDLE [mix [DESCENDER + O] groundy 0.5]
 }
 
 ### c e t
@@ -578,13 +578,14 @@ create-glyph 'z' : glyph-construction {
 	local cor 1.2
 	
 	include : HBarTop SB RIGHTSB XH
-	include : HBarBottom SB RIGHTSB 0
-	
+
 	start-from SB STROKE
 	line-to [SB + STROKE * cor] STROKE
 	line-to RIGHTSB [XH - STROKE]
 	line-to [RIGHTSB - STROKE * cor] [XH - STROKE]
 	reverse-last
+
+	include : HBarBottom SB RIGHTSB 0
 }
 
 define [SmallKShape] : glyph-construction {
diff --git a/glyphs/latin-extend-decorated.patel b/glyphs/latin-extend-decorated.patel
index ef5386a..59f71c9 100644
--- a/glyphs/latin-extend-decorated.patel
+++ b/glyphs/latin-extend-decorated.patel
@@ -529,14 +529,107 @@ create-glyph 'ezhtail' : glyph-construction {
 		:.arc-vh-to  [mix SB RIGHTSB 0.4] [DESCENDER + STROKE]
 		:.line-to    RIGHTSB [DESCENDER + STROKE]
 }
-# Downward tail
-create-glyph 'Zdowntail' : glyph-construction {
+# Downtail
+create-glyph 'Zdtail' : glyph-construction {
 	assign-unicode 0x224
 	include glyphs.Z AS_BASE
+	this.contours.pop
+	include : spiro {
+		widths.lhs
+		flat SB 0
+		curl [RIGHTSB - HOOKX] 0
+		archv
+		flat RIGHTSB [-HOOK] [widths 0 STROKE]
+		curl RIGHTSB [-HOOK - 1]
+	}
+}
+create-glyph 'zdtail' : glyph-construction {
+	assign-unicode 0x225
+	include glyphs.z AS_BASE
+	this.contours.pop
+	include : spiro {
+		widths.lhs
+		flat SB 0 [heading RIGHTWARD]
+		curl [RIGHTSB - HOOKX] 0
+		archv
+		g4 RIGHTSB [-HOOK] [widths.heading 0 STROKE DOWNWARD]
+	}
+}
+# Swash tail
+create-glyph 'Sswash' : glyph-construction {
+	assign-unicode 0x2C7E
+	include ifMarks
+	include glyphs.S
+	include : spiro {
+		widths.lhs [adviceBlackness 4.5]
+		g4 [SB - OXHOOK] HOOK
+		alsothru 0.3 0.6 important
+		flat [RIGHTSB - 1] DESCENDER [widths STROKE 0]
+		curl RIGHTSB DESCENDER
+	}
+}
+create-glyph 'sswash' : glyph-construction {
+	assign-unicode 0x23F
+	include pMarks
+	include glyphs.s
+	include : spiro {
+		widths.lhs [adviceBlackness 4.5]
+		g4 [SB - OXHOOK] SHOOK
+		alsothru 0.36 0.6 important
+		flat [RIGHTSB - 1] DESCENDER [widths STROKE 0]
+		curl RIGHTSB DESCENDER
+	}
+}
+create-glyph 'Zswash' : glyph-construction {
+	assign-unicode 0x2C7F
+	include ifMarks
+	local cor 1.15
+	
+	include : HBarTop SB RIGHTSB CAP
+	
+	start-from SB 0
+	line-to [SB + STROKE * cor] 0
+	line-to RIGHTSB [CAP - STROKE]
+	line-to [RIGHTSB - STROKE * cor] [CAP - STROKE]
+	reverse-last
+	
+	include : spiro {
+		widths.lhs
+		g4 SB 0
+		alsothru 0.36 0.6 important
+		flat [RIGHTSB - 1] DESCENDER
+		curl RIGHTSB DESCENDER
+	}
+}
+create-glyph 'zswash' : glyph-construction {
+	assign-unicode 0x240
+	include pMarks
+	
+	include : HBarTop SB RIGHTSB XH
+
+	local cor 1.2
+	start-from SB 0
+	line-to [SB + STROKE * cor] 0
+	line-to RIGHTSB [XH - STROKE]
+	line-to [RIGHTSB - STROKE * cor] [XH - STROKE]
+	reverse-last
+
+	include : spiro {
+		widths.lhs
+		g4 [SB - OXHOOK] 0
+		alsothru 0.36 0.6 important
+		flat [RIGHTSB - 1] DESCENDER
+		curl RIGHTSB DESCENDER
+	}
+}
+# Descended
+create-glyph 'Zdesc' : glyph-construction {
+	assign-unicode 0x2C6B
+	include glyphs.Z AS_BASE
 	include : VBarRight [mix SB RIGHTSB 1.05] [HALFSTROKE - LONGJUT] STROKE
 }
-create-glyph 'zdowntail' : glyph-construction {
-	assign-unicode 0x225
+create-glyph 'zdesc' : glyph-construction {
+	assign-unicode 0x2C6C
 	include glyphs.z AS_BASE
 	include : VBarRight [mix SB RIGHTSB 1.05] [HALFSTROKE - LONGJUT] STROKE
 }