diff --git a/laantas-script/Glyphs.hs b/laantas-script/Glyphs.hs
index 00c2334..622b8df 100644
--- a/laantas-script/Glyphs.hs
+++ b/laantas-script/Glyphs.hs
@@ -53,7 +53,7 @@ tp = G {path = tpPath, width = 9.5}
 tb = G {path = tbPath, width = 10}
 ts = G {path = tsPath, width = 9}
 tš = G {path = tšPath, width = 9}
-tl = G {path = tlPath, width = 9}
+tl = G {path = tlPath, width = 8.5}
 tm = G {path = tmPath, width = 10}
 tn = G {path = tnPath, width = 9}
 tr = G {path = trPath, width = 7}
@@ -76,11 +76,11 @@ tkPath = tPart 5 <> shiftX 5 (aPath <> kBottomShort <> P [mA (4,-3), lR (0,8)])
 tgPath = shiftX 5 gShortHat <> tkPath  -- tPart 5 <> shiftX 5 gShort
 tdPath = tPart 4 <> shiftX 4 dPath
 tƶPath = tdPath <> P [mA (6,-3), lR (3,0)]
-tpPath = P [mA (2,-3), lR (0,8), mA (0,-3), lR (5.5,0)] <> shiftX 4 pPath
+tpPath = P [mA (2,-3), lR (0,8), mA (0,-3), lR (6,0)] <> shiftX 4 pPath
 tbPath = tPart 6 <> shiftX 4 bPath
 tsPath = tPart 4 <> shiftX 4 sPath
 tšPath = tPart 4 <> shiftX 4 šPath
-tlPath = tPart 5 <> shiftX 4 lPath
+tlPath = tPart 5 <> shiftX 3.5 lPath
 tmPath = tPart 4.5 <> shiftX 4 mPath
 tnPath = tPart 6 <> shiftX 4 nPath
 trPath = tPart 7 <> shiftX 4 rShort
@@ -100,7 +100,7 @@ k = G {path = kPath, width = 5}
 kk = G {path = kkPath, width = 8}
 ks = G {path = ksPath, width = 9}
 
-kLeft = P [mA (0,0), cR (0.3,0.5) (0,3) (0,5)]
+kLeft = P [mA (0,0), cR (0.5,0.75) (0,3) (0,5)]
 kBottomShort = P [cR (0,0) (2.6,0) (4,-0.5)]
 kPath = kLeft <> kBottom <> P [mA (5,-3), lR (0,8)]
 kBottom = P [cR (0,0) (3,0) (5,-0.5)]
@@ -121,8 +121,10 @@ gShortHat = P [mA (1.25,-2.75), qR (1.25,0.125) (2.75,-0.25)]
 d = G {path = dPath, width = 5}
 
 dPath = dPart <> P [mA (5,-3), lR (0,8)]
+dPart' = dBase <> dJoin'
 dPart = dBase <> dJoin
-dJoin = P [mA (2,5), cR (2,0) (3,-1) (3,-2)]
+dJoin = P [{-mA (2,5),-} cR (2,0) (3,-0.75) (3,-1.5)]
+dJoin' = P [{-mA (2,5),-} cR (1.75,0) (2.5,-0.75) (2.85,-2.5)]
 dBase = P [mA (0,0), lR (3.5,0), cR (0,1.5) (-3.5,3.5) (-3.5,5), lR (2,0)]
 dFree = dBase <> P [mA (2,5), lR (1.5,0)]
 dLong = dFree <> shiftX 1.5 dJoin
@@ -154,23 +156,23 @@ dLong = dFree <> shiftX 1.5 dJoin
 ƶj = G {path = ƶjPath, width = 7}
 ƶ0 = G {path = ƶ0Path, width = 3.5}
 
-ƶPath = dPath <> P [mA (1,-3), lR (4,0), mA (5,5)]
+ƶPath = gHat <> dPath
 ƶtPath = dLong <> shiftX 5 tPath
 ƶkPath = dPart <> shiftX 5 kShort
 ƶgPath = dPart <> shiftX 5 gShort
-ƶdPath = dFree <> shiftX 5 dPath <> P [mA (1,-2), lR (2,0)]
+ƶdPath = dFree <> shiftX 5 dPath
 ƶƶPath = dFree <> shiftX 5 ƶPath
 ƶpPath = dFree <> shiftX 5 pPath
-ƶbPath = dPart <> shiftX 5 bPath
+ƶbPath = dPart' <> shiftX 5 bPath
 ƶsPath = dPart <> shiftX 5 sPath
 ƶšPath = dPart <> shiftX 5 šPath
 ƶlPath = dPart <> shiftX 5 lPath
 ƶmPath = dPart <> shiftX 5 mPath
-ƶnPath = dPart <> shiftX 5 nPath
+ƶnPath = dPart' <> shiftX 5 nPath -- TODO dPart or dPart'?
 ƶrPath = dPart <> shiftX 5 rCursive
 ƶčPath = dFree <> shiftX 5 čPath
 ƶǧPath = dFree <> shiftX 5 ǧPath
-ƶwPath = dPart <> shiftX 5 wPath
+ƶwPath = dPart' <> shiftX 5 wPath
 ƶhPath = dPart <> shiftX 5 hPath
 ƶfPath = dFree <> shiftX 4 fPath
 ƶjPath = dFree <> shiftX 2 jPath
@@ -182,16 +184,26 @@ pGlyphs = [("p", p), ("pp", pp), ("ps", ps), ("pj", pj)]
 p = G {path = pPath, width = 5.5}
 pp = G {path = ppPath, width = 8}
 ps = G {path = psPath, width = 10.5}
-pj = G {path = pjPath, width = 9.5}
+pj = G {path = pjPath, width = 10}
 
+pInit =
+  P [mA (0,-3), cR (-1,1) (-0.5,6) (-0.5,8)]
 pPart =
-  Shift 1.5 (-3) aPath <>
-  P [lR (0,3), cR (-1,-3) (-2,-4) (0,-5), cR (1,-0.5) (2.5,-0.5) (4,0)]
+  shiftX 2 pInit <>
+  P [cR (-1,-3) (-2,-4) (0,-5), cR (1,-0.5) (2.5,-0.5) (4,0)]
 pPath = pPart <> shiftX 5.25 aPath
-ppPath = P [mA (1.5,-3), lR (0,8), sR (-1.5,-3) (-1.5,-5),
-            mA (4,-3), lR (0,8), mA (0,0), lR (8,0), lR (0,5)]
+ppPath =
+  shiftX 2 pInit <> shiftX 4.5 pInit <>
+  P [mA (1.5,5), cR (-1,-3) (-2,-4) (0,-5), cR (1,-0.5) (2.5,-0.5) (7.5,0)] <>
+  shiftX 8.75 aPath
 psPath = pPart <> shiftX 5.5 sPath
-pjPath = pPath <> P [mA (5,0), lR (4,0), lR (0,5)]
+-- pjPath = pPath <> shiftX 7 jPath
+pjPath =
+  shiftX 2 pInit <>
+  P [cR (-1,-3) (-2,-4) (0,-5), cR (1,-0.5) (4,-1) (4,1),
+     lR (0,4), mR (0,-4),
+     cR (0,-2) (3.5,-1) (4.5,-1)] <>
+  shiftX 9.75 aPath
 
 
 bGlyphs = [("b", b), ("bj", bj)]
@@ -200,7 +212,10 @@ b = G {path = bPath, width = 6}
 bj = G {path = bjPath, width = 9}
 
 bPath = shiftX 1 gHat <> wPart <> P [mA (6,-3), lR (0,8)]
-bjPath = bPath <> P [mA (6,1), cR (0.25,-2) (3,-2.5) (3,-1), lR (0,5)]
+bjPath =
+  bPath <>
+  P [mA (6,0.5), qR (1.5,0) (3,-0.5)] <>
+  shiftX 8.75 aPath
 
 
 sGlyphs = [("s",s), ("st",st), ("sk",sk), ("sg",sg), ("sd",sd), ("sƶ",sƶ),
@@ -218,7 +233,7 @@ sp = G {path = spPath, width = 9.5}
 sb = G {path = sbPath, width = 10}
 ss = G {path = ssPath, width = 10}
 sš = G {path = sšPath, width = 10}
-sl = G {path = slPath, width = 10}
+sl = G {path = slPath, width = 9.5}
 sm = G {path = smPath, width = 11}
 sn = G {path = snPath, width = 10}
 sr = G {path = srPath, width = 9}
@@ -231,26 +246,35 @@ sj = G {path = sjPath, width = 6}
 s0 = G {path = s0Path, width = 5}
 
 sPath = sPartLine <> shiftX 5 aPath
-sPart = P [mA (0, 0), lR (0, 3.5), aR 1.5 1.5 0 Small CCW (3,0), lR (0,-3.5)]
-sPartLine = sPart <> P [mA (3,0), lR (2,0)]
+-- sPart = P [mA (0, 0), lR (0, 3.5), aR 1.5 1.5 0 Small CCW (3,0), lR (0,-3.5)]
+sPart = P [mA (0, 0),
+           cR (0.15,0.5) (0,2.5) (0,3.5),
+           aR 1.5 1.5 0 Small CCW (3,0),
+           qR (0,-3) (-0.5, -3.5)]
+sPartIso = P [mA (0, 0),
+              cR (0.15,0.5) (0,2.5) (0,3.5),
+              aR 1.5 1.5 0 Small CCW (3,0),
+              cR (0,-0.5) (-0.15,-2.5) (0,-3.5)]
+sPartLine = sPart <> P [mA (2.5,0), lR (2.5,0)]
 stPath = sPartLine <> shiftX 4 tPath
 skPath = sPartLine <> shiftX 5 kShort
 sgPath = sPartLine <> shiftX 5 gShort
-sdPath = sPart <> P [mA (3,0), lR (1,0)] <> shiftX 4 dPath
-sƶPath = sPart <> P [mA (3,0), lR (1,0)] <> shiftX 4 ƶPath
-spPath = sPart <> shiftX 4 pPath
-sbPath = sPart <> shiftX 4 bPath <> P [mA (3,0), lR (0,-3), lR (3.5,0), mA (10,5)]
+sdPath = sPart <> P [mA (2.5,0), lR (1.5,0)] <> shiftX 4 dPath
+sƶPath = sPart <> P [mA (2.5,0), lR (1.5,0)] <> shiftX 4 ƶPath
+spPath = sPartIso <> shiftX 4 pPath
+-- TODO
+sbPath = sPartIso <> shiftX 4 bPath <> P [mA (3,0), lR (0,-3), lR (3.5,0), mA (10,5)]
 ssPath = sPartLine <> shiftX 5 sPath
 sšPath = sPartLine <> shiftX 5 šPath
-slPath = sPart <> P [mA (3,0), lR (3,0)] <> shiftX 5 lPath
-smPath = sPart <> P [mA (3,0), lR (2.5,0)] <> shiftX 5 mPath
-snPath = sPart <> P [mA (3,0), lR (4,0)] <> shiftX 5 nPath
-srPath = sPart <> P [mA (3,0), lR (4,0)] <> shiftX 4 rShort
-sčPath = sPart <> shiftX 3 čFlat
-sǧPath = sPart <> shiftX 4 ǧPath
-swPath = sPart <> P [mA (3,0), lR (3.5,0)] <> shiftX 4 wPath
-shPath = sPart <> shiftX 5 hPath
-sfPath = sPart <> shiftX 4 fPath
+slPath = sPart <> P [mA (2.5,0), lR (3.5,0)] <> shiftX 4.5 lPath
+smPath = sPart <> P [mA (2.5,0), lR (3,0)] <> shiftX 5 mPath
+snPath = sPart <> P [mA (2.5,0), lR (4.5,0)] <> shiftX 5 nPath
+srPath = sPart <> P [mA (2.5,0), lR (4.5,0)] <> shiftX 4 rShort
+sčPath = sPart <> P [mA (2.5,0), lR (1.5,0)] <> shiftX 3 čFlat
+sǧPath = sPartIso <> shiftX 4 ǧPath
+swPath = sPart <> P [mA (2.5,0), lR (4,0)] <> shiftX 4 wPath
+shPath = sPartIso <> shiftX 5 hPath
+sfPath = sPartIso <> shiftX 4 fPath
 sjPath = P [mA (0,0), lR (0,3.5), aR 1.5 1.5 0 Small CCW (3,0), lR (0,-1.5),
             mA (3,0), lR (3,0), lR (0,5), mA (3,2), lR (3,0)]
 s0Path = sPath <> P [mA (1.5,7), cR (1.8,-0.25) (2.6,0) (3,0.5)]
@@ -295,61 +319,58 @@ lGlyphs = [("l",l), ("ll", ll), ("lt",lt), ("lk",lk), ("lg",lg), ("ld",ld),
            ("ln",ln), ("lr",lr), ("lč",lč), ("lǧ",lǧ), ("lw",lw), ("lh",lh),
            ("lf",lf), ("lj",lj)]
 
-l = G {path = lPath, width = 5}
-ll = G {path = llPath, width = 10}
-lt = G {path = ltPath, width = 10.5}
-lk = G {path = lkPath, width = 9}
-lg = G {path = lgPath, width = 9}
-ld = G {path = ldPath, width = 10}
-lƶ = G {path = lƶPath, width = 10}
-lp = G {path = lpPath, width = 10.5}
-lb = G {path = lbPath, width = 11}
-ls = G {path = lsPath, width = 10}
-lš = G {path = lšPath, width = 10}
-lm = G {path = lmPath, width = 11}
-ln = G {path = lnPath, width = 10}
-lr = G {path = lrPath, width = 10}
-lč = G {path = lčPath, width = 10}
-lǧ = G {path = lǧPath, width = 10}
-lw = G {path = lwPath, width = 11}
-lh = G {path = lhPath, width = 13}
-lf = G {path = lfPath, width = 11}
-lj = G {path = ljPath, width = 6}
-l0 = G {path = l0Path, width = 4}
+l = G {path = lPath, width = 4.5}
+ll = G {path = llPath, width = 9}
+lt = G {path = ltPath, width = 10}
+lk = G {path = lkPath, width = 8.5}
+lg = G {path = lgPath, width = 8.5}
+ld = G {path = ldPath, width = 9.5}
+lƶ = G {path = lƶPath, width = 9.5}
+lp = G {path = lpPath, width = 10}
+lb = G {path = lbPath, width = 10.5}
+ls = G {path = lsPath, width = 9.5}
+lš = G {path = lšPath, width = 9.5}
+lm = G {path = lmPath, width = 10.5}
+ln = G {path = lnPath, width = 9.5}
+lr = G {path = lrPath, width = 9.5}
+lč = G {path = lčPath, width = 9.5}
+lǧ = G {path = lǧPath, width = 9.5}
+lw = G {path = lwPath, width = 10.5}
+lh = G {path = lhPath, width = 12.5}
+lf = G {path = lfPath, width = 10.5}
+lj = G {path = ljPath, width = 4.5}
+l0 = G {path = l0Path, width = 3.75}
 
-lPath = lPart <> P [mA (4,4.5), lR (1,-0.7), mA (5,0), lR (0,5)]
-lBase = P [mA (4,0.5), cR (-2.25,-0.75) (-2.55,-0.5) (-2.75,-0.5),
-           aR 1.25 1.25 0 Small CCW (0,2.5), lR (2,0), mR (-2,0),
-           aR 1.25 1.25 0 Small CCW (0,2.5), lR (0.75,0)]
-lPart = lBase <> dJoin
-lPartFlat = lBaseFlat <> shiftX 1 dJoin
-lBaseFlat = P [mA (4,0), lR (-2.75,0),
-               aR 1.25 1.25 0 Small CCW (0,2.5), lR (2,0), mR (-2,0),
-               aR 1.25 1.25 0 Small CCW (0,2.5), lR (2,0)]
-lFree = P [mA (4,0.5), cR (-2.25,-0.75) (-2.55,-0.5) (-2.75,-0.5),
-           aR 1.25 1.25 0 Small CCW (0,2.5), lR (2,0), mR (-2,0),
-           aR 1.25 1.25 0 Small CCW (0,2.5),
-           cR (0.2,0.25) (2.25,0) (2.75,-0.5)]
-lLong = lBase <> P [mA (2,5), lR (2,0)] <> shiftX 1.5 dJoin
-llPath = lPart <> shiftX 5 lPath
-ltPath = lLong <> shiftX 5 tPath
-lkPath = lPart <> shiftX 5 kShort
-lgPath = lPart <> shiftX 5 gShort
-ldPath = lFree <> shiftX 5 dPath
-lƶPath = lFree <> shiftX 5 ƶPath
-lpPath = lFree <> shiftX 5 pPath
-lbPath = lPart <> shiftX 5 bPath
-lsPath = lPart <> shiftX 5 sPath
-lšPath = lPart <> shiftX 5 šPath
-lmPath = lPart <> shiftX 5 mPath
-lnPath = lPart <> shiftX 5 nPath
-lrPath = lPart <> shiftX 5 rCursive
-lčPath = lFree <> shiftX 5 čPath
-lǧPath = lFree <> shiftX 5 ǧPath
-lwPath = lPart <> shiftX 5 wPath
-lhPath = lPart <> shiftX 5 hPath
-lfPath = lFree <> shiftX 5 fPath
-ljPath = lPartFlat <> P [mA (4,0), lR (2,0), lR (0,5)]
+lPath = lPart <> P [mA (4.5,0), lR (0,5)]
+lBase = P [mA (3,0.5), cR (0.25,-0.25) (0,-0.75) (-1.25,-0.5),
+           cR (-1.5,0.3) (-2,2.5) (0,2.5),
+           lR (0.75,0), mR (-1.25,0),
+           cR (-1.5,0.3) (-2,2.5) (0,2.5)]
+lJoin = P [lR (0.25,0)] <> dJoin
+lJoin' = P [lR (0.25,0)] <> dJoin'
+lPart = lBase <> lJoin
+lPart' = lBase <> lJoin'
+lFree = lBase <> P [qR (2.25,0) (2.5,-0.5)]
+lFree' = lBase <> P [qR (2,0) (2.25,-0.75)]
+llPath = lPart <> shiftX 4.5 lPath
+ltPath = lBase <> P [qR (4.5,0) (4.75,-3)] <> shiftX 4.5 tPath
+lkPath = lPart <> shiftX 4.5 kShort
+lgPath = lPart <> shiftX 4.5 gShort
+ldPath = lFree' <> shiftX 4.5 dPath
+lƶPath = lFree' <> shiftX 4.5 ƶPath
+lpPath = lFree' <> shiftX 4.5 pPath
+lbPath = lPart' <> shiftX 4.5 bPath
+lsPath = lPart <> shiftX 4.5 sPath
+lšPath = lPart <> shiftX 4.5 šPath
+lmPath = lPart <> shiftX 4.5 mPath
+lnPath = lPart' <> shiftX 4.5 nPath -- TODO lPart or lPart'?
+lrPath = lPart <> shiftX 4.5 rCursive
+lčPath = lFree' <> shiftX 4.5 čPath
+lǧPath = lFree' <> shiftX 4.5 ǧPath
+lwPath = lPart' <> shiftX 4.5 wPath
+lhPath = lPart <> shiftX 4.5 hPath
+lfPath = lFree' <> shiftX 4.5 fPath
+ljPath = lPart <> shiftX 0.5 gShortHat <> P [mA (4.5,-3), lR (0,8)]
 l0Path = lFree <> P [mA (1.25,7), cR (1.8,-0.25) (2.2,0) (2.5,0.5)]
 
 
@@ -558,17 +579,18 @@ wPart = uPath <> P [mA (2.5,0), lR (3.5,0)]
 
 hGlyphs = [("h", h), ("hh", hh), ("hn", hn), ("hm", hm)]
 
-h = G {path = hPath, width = 8}
-hh = G {path = hhPath, width = 16}
-hn = G {path = hnPath, width = 14}
-hm = G {path = hmPath, width = 15}
+h = G {path = hPath, width = 8.5}
+hh = G {path = hhPath, width = 16.5}
+hn = G {path = hnPath, width = 15}
+hm = G {path = hmPath, width = 16}
 
-hPath = hPart <> P [mA (5,-3), lR (3,0), lR (0,8)]
-hPart = sPart <> P [mA (3,0), lR (1,0)] <> shiftX 4 sPart
-hhPath = hPart <> P [mA (7,0), lR (1,0)] <> shiftX 8 hPart <>
-         P [mA (12,-3), lR (4,0), lR (0,8)]
-hnPath = hPath <> shiftX 9 nPath
-hmPath = hPath <> shiftX 9 mPath
+hPath = hPart <> shiftX 3.5 gHat <> P [mA (8.5,-3), lR (0,8)]
+hPart' x = sPart <> P [mA (2.5,0), lR (1.5,0)] <> shiftX 4 x
+hPart = hPart' sPartIso
+hhPath = hPart' sPart <> P [mA (6.5,0), lR (1.5,0)] <> shiftX 8 hPart <>
+         shiftX 11.5 gHat <> P [mA (16.5,-3), lR (0,8)]
+hnPath = hPath <> shiftX 10 nPath
+hmPath = hPath <> shiftX 10 mPath
 
 
 fGlyphs = [("f", f), ("fn", fn), ("fm", fm)]
@@ -607,7 +629,7 @@ ia = G {path = iaPath, width = 5}
 ua = G {path = uaPath, width = 4.5}
 ḿ = G {path = ḿPath, width = 6}
 ń = G {path = ńPath, width = 3}
-ł = G {path = łPath, width = 4}
+ł = G {path = łPath, width = 3.75}
 ŕ = G {path = ŕPath, width = 5}
 
 aPath = P [mA (0.25,0), cR (-0.25,1) (-0.25,2) (-0.25,5)]