diff --git a/glyphs/clpchars_p.mf b/glyphs/clpchars_p.mf
index 3dc8756..51019d2 100644
--- a/glyphs/clpchars_p.mf
+++ b/glyphs/clpchars_p.mf
@@ -356,9 +356,9 @@ x1=x5=w;
 x2=x4=0.5w;
 x3=0;
 top y2=h+o;
-y1=0.75h;
+y1=0.725h;
 y3=0.5h;
-y5=0.25h;
+y5=0.275h;
 bot y4=-o;
 dotdraw z1..z2{left}..z3{down}..z4{right}..z5;
 adjustwidth(xgap#,xgap#);
@@ -413,7 +413,7 @@ x2=x4=0.5w;
 x7=0.6w;
 x3=0;
 top y2=h+o;
-y1=0.75h;
+y1=0.725h;
 y3=0.5h;
 y6=y7=0.4h;
 y5=0.3h;
@@ -454,10 +454,10 @@ endchar;
 beginchar("J",45u#,ht#,0);
 pickup cornerpen;
 x2=x5=0;
-x4=0.5w;
+x4=0.5w-0.25px;
 x1=x3=w-0.5px;
 top y1=top y2=h;
-y3=0.4h;
+y3=0.35h;
 y5=0.3h;
 bot y4=-o;
 dotdraw z1--z3{down}..z4{left}..z5;
@@ -484,7 +484,7 @@ endchar;
 beginchar("L",45u#,ht#,0);
 pickup cornerpen;
 x1=x2=0+0.5px;
-x3=w-0.5px;
+x3=w;
 bot y2=bot y3=0;
 top y1=h;
 dotdraw z1--z2--z3;
@@ -537,7 +537,7 @@ x7=w;
 bot y1=0;
 top y3=top y6=h;
 y2=y5=0.5h;
-y7=0.75h;
+y7=0.75h-0.25px;
 dotdraw z1--z2--z3--z6{right}..z7{down}..z5{left}--z2;
 adjustwidth(xgap#,xgap#);
 penlabels(range 1 thru 150);
@@ -548,12 +548,12 @@ pickup cornerpen;
 x1=w;
 x2=x4=0.5w;
 x5=0.65w;
-x6=w;
+x6=w-0.5px;
 x3=0;
 top y2=h+o;
 y1=y3=0.5h;
 y5=0.25h;
-y6=0;
+bot y6=0;
 bot y4=-o;
 dotdraw z1{up}..z2{left}..z3{down}..z4{right}..cycle;
 z7=whatever[z5,z6]=whatever[z1,z4];
@@ -566,11 +566,12 @@ beginchar("R",45u#,ht#,0);
 pickup cornerpen;
 x1=x2=x3=0+0.5px;
 x5=x6=0.6w;
-x4=x7=w;
+x7=w;
+x4=w-0.5px;
 bot y1=bot y4=0;
 top y3=top y6=h;
 y2=y5=0.5h;
-y7=0.75h;
+y7=0.75h-0.25px;
 dotdraw z1--z2--z3--z6{right}..z7{down}..z5{left}--z4;
 dotdraw z5--z2;
 adjustwidth(xgap#,xgap#);
@@ -584,10 +585,10 @@ x3=x5=x6=0.5w;
 x4=x7=w;
 bot y3=0-o;
 top y6=h+o;
-y1=y4=0.25h;
+y1=y4=0.25h+0.25px;
 y5=0.5h;
-y2=y7=0.75h;
-interdotdraw z1{down}..z3{right}..z4{up}..z5{left}..z2{up}..z6{right}..z7{down};
+y2=y7=0.75h-0.25px;
+interdotdraw z1{down}..z3{right}..z4{up}..z2{up}..z6{right}..z7{down};
 adjustwidth(xgap#,xgap#);
 penlabels(range 1 thru 150);
 endchar;
@@ -611,7 +612,7 @@ x1=x2=0+0.5px;
 x3=0.5w;
 x4=x7=w-0.5px;
 bot y3=-o;
-y1=y4=0.3h;
+y1=y4=0.275h;
 top y2=top y7=h;
 dotdraw z2--z1{down}..z3{right}..z4{up}--z7;
 adjustwidth(xgap#,xgap#);
@@ -677,8 +678,10 @@ endchar;
 
 beginchar("Z",45u#,ht#,0);
 pickup cornerpen;
-x1=x2=0;
-x3=x4=w;
+x1=0;
+x2=0+0.5px;
+x3=w;
+x4=w-0.5px;
 x5=0.5w;
 bot y1=bot y3=0;
 top y2=top y4=h;
@@ -693,7 +696,7 @@ endchar;
 beginchar("a",45u#,x_ht#,0);
 pickup cornerpen;
 x1=x2=x4=w-0.5px;
-x3=x5=0.5w;
+x3=x5=0.5w-0.25px;
 x6=0;
 bot y1=0;
 top y2=h;
@@ -709,13 +712,13 @@ endchar;
 beginchar("b",45u#,ht#,0);
 pickup cornerpen;
 x4=w;
-x3=x5=0.5w;
+x3=x5=0.5w+0.25px;
 x1=x2=x6=0+0.5px;
 bot y1=0;
-top y2=h;
+y2=h;
 y3=x_ht+o;
 bot y5=-o;
-y4=y6=0.5x_ht;
+y4=y6=0.5x_ht+0.25px;
 dotdraw z1--z6--z2;
 dotdraw z4{up}..z3{left}..z6{down}..z5{right}..cycle;
 adjustwidth(xgap#,xgap#);
@@ -728,9 +731,9 @@ x1=x5=w;
 x2=x4=0.5w;
 x3=0;
 top y2=h+o;
-y1=0.75h;
+y1=0.7h;
 y3=0.5h;
-y5=0.25h;
+y5=0.3h;
 bot y4=-o;
 dotdraw z1..z2{left}..z3{down}..z4{right}..z5;
 adjustwidth(xgap#,xgap#);
@@ -740,13 +743,13 @@ endchar;
 beginchar("d",45u#,ht#,0);
 pickup cornerpen;
 x1=x2=x4=w-0.5px;
-x3=x5=0.5w;
+x3=x5=0.5w-0.25px;
 x6=0;
 bot y1=0;
-top y2=h;
+y2=h;
 y3=x_ht+o;
 bot y5=-o;
-y4=y6=0.5x_ht;
+y4=y6=0.5x_ht+0.25px;
 dotdraw z1--z4--z2;
 dotdraw z4{up}..z3{left}..z6{down}..z5{right}..cycle;
 adjustwidth(xgap#,xgap#);
@@ -755,8 +758,9 @@ endchar;
 
 beginchar("e",45u#,x_ht#,0);
 pickup cornerpen;
-x1=x5=w;
+x1=w;
 x2=x4=0.5w;
+x5=0.9w;
 x3=0;
 top y2=h+o;
 y1=y3=0.5h;
@@ -770,15 +774,16 @@ endchar;
 beginchar("f",45u#,ht#,0);
 pickup cornerpen;
 x5=0;
-x1=x2=0.4w;
-x4=0.6w;
+x1=x2=x7=0.4w;
+x4=0.7w;
 x6=0.8w;
 x3=w;
-top y4=h+o;
+y4=h+o;
 y3=0.9h;
 bot y1=0;
-y2=y5=y6=0.9x_ht;
-dotdraw z1--z2{up}..z4{right}..z3{down};
+y2=y5=y6=x_ht-0.5px;
+y7=x_ht+0.4(h-x_ht);
+dotdraw z1--z2--z7{up}..z4{right}..z3;
 dotdraw z5--z2--z6;
 adjustwidth(xgap#,xgap#);
 penlabels(range 1 thru 150);
@@ -787,11 +792,11 @@ endchar;
 beginchar("g",45u#,x_ht#,desc_depth#);
 pickup cornerpen;
 x1=x2=x4=w-0.5px;
-x3=x5=x7=0.5w;
+x3=x5=x7=0.5w-0.25px;
 x6=x8=0;
-bot y1=0;
+y1=-0.25desc_depth;
 top y2=h;
-y3=h+o;
+top y3=h+o;
 bot y5=-o;
 y4=y6=0.5x_ht;
 y7=-desc_depth-o;
@@ -808,7 +813,7 @@ x4=x5=w-0.5px;
 x3=0.5w;
 x1=x2=x6=0+0.5px;
 bot y1=0;
-top y2=h;
+y2=h;
 y3=x_ht+o;
 bot y5=0;
 y4=y6=0.6x_ht;
@@ -835,15 +840,16 @@ endchar;
 
 beginchar("j",45u#,ht#,desc_depth#);
 pickup cornerpen;
-x1=x2=x3=x4=0.9w-0.5px;
+x1=x2=x4=0.9w-0.5px;
 x5=x7=0.5w;
 x8=0.1w+0.5px;
-bot y1=-0.2d;
+y1=-0.4d;
 top y2=top y5=x_ht;
-top y3=top y4=ht;
+top y4=ht;
 y7=-desc_depth-o;
 y8=-0.5desc_depth;
 dotdraw z5--z2--z1{down}..z7{left}..z8;
+draw z4;
 adjustwidth(xgap#,xgap#);
 penlabels(range 1 thru 150);
 endchar;
@@ -853,7 +859,7 @@ pickup cornerpen;
 x3=x5=w;
 x1=x2=x6=0+0.5px;
 bot y1=0;
-top y2=h;
+y2=h;
 y3=x_ht;
 bot y5=0;
 y6=0.5x_ht;
@@ -886,8 +892,9 @@ x7=0.75w;
 x8=x9=w;
 x1=x2=x6=0;
 bot y1=bot y5=bot y9=0;
-top y2=top y3=top y7=h;
-y4=y6=y8=0.6h;
+top y2=h;
+top y3=top y7=h+o;
+y4=y6=y8=0.7h;
 dotdraw z1--z6--z2;
 dotdraw z5--z4{up}..z3{left}..z6{down};
 dotdraw z9--z8{up}..z7{left}..z4{down};
@@ -901,8 +908,9 @@ x4=x5=w-0.5px;
 x3=0.5w;
 x1=x2=x6=0+0.5px;
 bot y1=bot y5=0;
-top y2=top y3=h;
-y4=y6=0.6h;
+top y2=h;
+top y3=h+o;
+y4=y6=0.5h;
 dotdraw z1--z6--z2;
 dotdraw z5--z4{up}..z3{left}..z6{down};
 adjustwidth(xgap#,xgap#);
@@ -925,11 +933,11 @@ endchar;
 beginchar("p",45u#,x_ht#,desc_depth#);
 pickup cornerpen;
 x4=w;
-x3=x5=0.5w;
+x3=x5=0.5w+0.25px;
 x1=x2=x6=0+0.5px;
 y1=-desc_depth;;
 top y2=h;
-y3=x_ht+o;
+top y3=h+o;
 bot y5=-o;
 y4=y6=0.5x_ht;
 dotdraw z1--z6--z2;
@@ -941,12 +949,12 @@ endchar;
 beginchar("q",45u#,x_ht#,desc_depth#);
 pickup cornerpen;
 x1=x2=x4=w-0.5px;
-x3=x5=0.5w;
+x3=x5=0.5w-0.25px;
 x6=0;
 y1=-desc_depth;;
 top y2=h;
-y3=x_ht+o;
-bot y5=-o;
+top y3=h+o;
+bot y5=0-o;
 y4=y6=0.5x_ht;
 dotdraw z1--z4--z2;
 dotdraw z4{up}..z3{left}..z6{down}..z5{right}..cycle;
@@ -956,15 +964,15 @@ endchar;
 
 beginchar("r",45u#,x_ht#,0);
 pickup cornerpen;
-x3=0.5w;
-x5=w-0.5px;
-x1=x2=x6=0+0.5px;
+x3=0.55w;
+x5=0.95w-0.5px;
+x1=x2=x6=0.05w+0.5px;
 bot y1=0;
 top y2=top y3=h;
 y5=0.75h;
-y6=0.6h;
+y6=0.5h;
 dotdraw z1--z6--z2;
-dotdraw z5{up}..z3{left}..z6{down};
+dotdraw z5..z3{left}..z6{down};
 adjustwidth(xgap#,xgap#);
 penlabels(range 1 thru 150);
 endchar;
@@ -979,7 +987,7 @@ top y6=h+o;
 y1=y4=0.25h;
 y5=0.5h;
 y2=y7=0.75h;
-interdotdraw z1{down}..z3{right}..z4{up}..z5{left}..z2{up}..z6{right}..z7{down};
+interdotdraw z1..z3{right}..z4{up}..z2{up}..z6{right}..z7;
 adjustwidth(xgap#,xgap#);
 penlabels(range 1 thru 150);
 endchar;