diff --git a/src/Inter-UI-Black.ufo/glyphs/Hbar_.glif b/src/Inter-UI-Black.ufo/glyphs/Hbar_.glif
index a50a1c3db..6d08235bb 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Hbar_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Hbar_.glif
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Hbar" format="1">
-  <advance width="2048"/>
+  <advance width="1920"/>
   <unicode hex="0126"/>
   <outline>
     <contour>
-      <point x="1024.0" y="2200.0" type="move" name="top"/>
+      <point x="1944" y="1708" type="line"/>
+      <point x="-24" y="1708" type="line"/>
+      <point x="-24" y="1460" type="line"/>
+      <point x="1944" y="1460" type="line"/>
+    </contour>
+    <component base="H"/>
+    <contour>
+      <point x="960" y="2200" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1024.0" y="16.0" type="move" name="bottom"/>
+      <point x="960" y="16" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="2040.0" y="2200.0" type="move" name="top0315"/>
+      <point x="1976" y="2200" type="move" name="top0315"/>
     </contour>
-    <contour>
-      <point x="2008" y="1708" type="line"/>
-      <point x="40" y="1708" type="line"/>
-      <point x="40" y="1460" type="line"/>
-      <point x="2008" y="1460" type="line"/>
-    </contour>
-    <component base="H" xOffset="64"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Hcedilla_.glif b/src/Inter-UI-Black.ufo/glyphs/Hcedilla_.glif
index 2638b5e5c..6c543b7fb 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Hcedilla_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Hcedilla_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Hcedilla" format="1">
-  <advance width="2048"/>
+  <advance width="1920"/>
   <unicode hex="1E28"/>
   <outline>
-    <component base="H" xOffset="-4"/>
-    <component base="cedilla" xOffset="-20" yOffset="-12"/>
+    <component base="H"/>
+    <component base="cedilla" xOffset="-16" yOffset="-12"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni048A_.glif b/src/Inter-UI-Black.ufo/glyphs/uni048A_.glif
index bdd167d13..21112f859 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni048A_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni048A_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni048A" format="1">
-  <advance width="2304"/>
+  <advance width="2216"/>
   <unicode hex="048A"/>
   <outline>
+    <component base="afii10026"/>
+    <component base="breve" xOffset="344" yOffset="428"/>
+    <component base="comma" xOffset="1560" yOffset="-48"/>
     <contour>
-      <point x="932" y="2632" type="move" name="top"/>
+      <point x="976" y="2632" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1916" y="2200" type="move" name="top0315"/>
+      <point x="1960" y="2200" type="move" name="top0315"/>
     </contour>
-    <component base="afii10026" xOffset="-44"/>
-    <component base="breve" xOffset="300" yOffset="428"/>
-    <component base="comma" xOffset="1516" yOffset="-48"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni04C9_.glif b/src/Inter-UI-Black.ufo/glyphs/uni04C9_.glif
index e406ca34d..88eb09910 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni04C9_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni04C9_.glif
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni04C9" format="1">
-  <advance width="2304"/>
+  <advance width="2216"/>
   <unicode hex="04C9"/>
   <outline>
+    <component base="H"/>
+    <component base="comma" xOffset="1560" yOffset="-48"/>
     <contour>
       <point x="1984" y="2200" type="move" name="top_dd"/>
     </contour>
@@ -12,8 +14,6 @@
     <contour>
       <point x="1984" y="2200" type="move" name="top0315"/>
     </contour>
-    <component base="H"/>
-    <component base="comma" xOffset="1580" yOffset="-48"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni04CD__.glif b/src/Inter-UI-Black.ufo/glyphs/uni04CD__.glif
index 949f49eb1..32aa63a04 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni04CD__.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni04CD__.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni04CD" format="1">
-  <advance width="2816"/>
+  <advance width="2720"/>
   <unicode hex="04CD"/>
   <outline>
+    <component base="M"/>
+    <component base="comma" xOffset="2064" yOffset="-48"/>
     <contour>
-      <point x="2484" y="2200" type="move" name="top_dd"/>
+      <point x="2468" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="2484" y="-560" type="move" name="bottom_dd"/>
+      <point x="2468" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="2484" y="2200" type="move" name="top0315"/>
+      <point x="2468" y="2200" type="move" name="top0315"/>
     </contour>
-    <component base="M" xOffset="16"/>
-    <component base="comma" xOffset="2080" yOffset="-48"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/groups.plist b/src/Inter-UI-Black.ufo/groups.plist
index a02fb19f5..8e00f063b 100644
--- a/src/Inter-UI-Black.ufo/groups.plist
+++ b/src/Inter-UI-Black.ufo/groups.plist
@@ -878,6 +878,7 @@
 	<array>
 		<string>ae</string>
 		<string>a</string>
+		<string>a_uni02DE</string>
 		<string>agrave</string>
 		<string>aacute</string>
 		<string>acircumflex</string>
diff --git a/src/Inter-UI-Black.ufo/lib.plist b/src/Inter-UI-Black.ufo/lib.plist
index 626f9d408..be868994e 100644
--- a/src/Inter-UI-Black.ufo/lib.plist
+++ b/src/Inter-UI-Black.ufo/lib.plist
@@ -216,6 +216,7 @@
 				<string>H</string>
 				<string>Hcedilla</string>
 				<string>Hbar</string>
+				<string>uni04C9</string>
 				<string>I</string>
 				<string>Idieresisacute</string>
 				<string>Itildebelow</string>
@@ -225,6 +226,7 @@
 				<string>L</string>
 				<string>Lslash</string>
 				<string>M</string>
+				<string>uni04CD</string>
 				<string>N</string>
 				<string>afii10026</string>
 				<string>uni048A</string>
@@ -268,10 +270,8 @@
 				<string>Kahookcyrillic</string>
 				<string>afii10029</string>
 				<string>uni04C5</string>
-				<string>uni04CD</string>
 				<string>Enhookcyrillic</string>
 				<string>Endescendercyrillic</string>
-				<string>uni04C9</string>
 				<string>Enghecyrillic</string>
 				<string>afii10147</string>
 				<string>afii10145</string>
@@ -1682,6 +1682,7 @@
 		<string>H</string>
 		<string>Hcedilla</string>
 		<string>Hbar</string>
+		<string>uni04C9</string>
 		<string>I</string>
 		<string>Idieresisacute</string>
 		<string>Itildebelow</string>
@@ -1691,6 +1692,7 @@
 		<string>L</string>
 		<string>Lslash</string>
 		<string>M</string>
+		<string>uni04CD</string>
 		<string>N</string>
 		<string>afii10026</string>
 		<string>uni048A</string>
@@ -1734,10 +1736,8 @@
 		<string>Kahookcyrillic</string>
 		<string>afii10029</string>
 		<string>uni04C5</string>
-		<string>uni04CD</string>
 		<string>Enhookcyrillic</string>
 		<string>Endescendercyrillic</string>
-		<string>uni04C9</string>
 		<string>Enghecyrillic</string>
 		<string>afii10147</string>
 		<string>afii10145</string>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/a_uni02DE__.glif b/src/Inter-UI-Regular.ufo/glyphs/a_uni02DE__.glif
index b71c6dc1c..231148c38 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/a_uni02DE__.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/a_uni02DE__.glif
@@ -1,43 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="a_uni02DE" format="1">
-  <advance width="2048"/>
+  <advance width="2096"/>
   <outline>
-    <component base="a" xOffset="-228"/>
-    <component base="rhotichookmod" xOffset="1252"/>
+    <component base="a"/>
+    <component base="rhotichookmod" xOffset="1288" yOffset="-52"/>
     <contour>
-      <point x="460" y="0" type="move" name="bottom"/>
+      <point x="688" y="0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="572" y="1776" type="move" name="top"/>
+      <point x="764" y="1776" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1820" y="1776" type="move" name="top0315"/>
+      <point x="2048" y="1776" type="move" name="top0315"/>
     </contour>
     <contour>
-      <point x="460" y="0" type="move" name="markbottom"/>
+      <point x="688" y="0" type="move" name="markbottom"/>
     </contour>
     <contour>
-      <point x="1308" y="2200" type="move" name="top_dd"/>
+      <point x="1536" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1112" y="0" type="move" name="ogonek"/>
+      <point x="1340" y="0" type="move" name="ogonek"/>
     </contour>
     <contour>
-      <point x="1308" y="-560" type="move" name="bottom_dd"/>
+      <point x="1536" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="736" y="1776" type="move" name="rhalfring"/>
+      <point x="764" y="1776" type="move" name="rhalfring"/>
     </contour>
   </outline>
   <lib>
     <dict>
-      <key>com.typemytype.robofont.mark</key>
-      <array>
-        <real>0.87</real>
-        <real>0.87</real>
-        <real>0.87</real>
-        <real>1.0</real>
-      </array>
       <key>interface.gridadjust.original</key>
       <string>{'width': 2046.0, 'leftMargin': 236, 'rightMargin': -223.0}</string>
     </dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/rhotichookmod.glif b/src/Inter-UI-Regular.ufo/glyphs/rhotichookmod.glif
index 2f7ba2637..4d31bc30a 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/rhotichookmod.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/rhotichookmod.glif
@@ -4,25 +4,25 @@
   <unicode hex="02DE"/>
   <outline>
     <contour>
-      <point x="-16" y="880" type="move" name="_markrhotichook"/>
-    </contour>
-    <contour>
-      <point x="-20" y="752" type="line"/>
-      <point x="276" y="808" type="line"/>
-      <point x="328" y="620"/>
-      <point x="380" y="484"/>
-      <point x="608" y="484" type="curve" smooth="yes"/>
-      <point x="672" y="484"/>
+      <point x="-20" y="760" type="line"/>
+      <point x="304" y="820" type="line"/>
+      <point x="356" y="648"/>
+      <point x="404" y="492"/>
+      <point x="616" y="492" type="curve" smooth="yes"/>
+      <point x="676" y="492"/>
       <point x="736" y="504"/>
       <point x="788" y="528" type="curve"/>
-      <point x="740" y="756" type="line"/>
-      <point x="720" y="752"/>
-      <point x="700" y="752"/>
-      <point x="680" y="752" type="curve" smooth="yes"/>
-      <point x="528" y="752"/>
-      <point x="536" y="876"/>
-      <point x="500" y="1100" type="curve"/>
-      <point x="-20" y="1000" type="line"/>
+      <point x="744" y="740" type="line"/>
+      <point x="724" y="736"/>
+      <point x="700" y="732"/>
+      <point x="680" y="732" type="curve" smooth="yes"/>
+      <point x="528" y="732"/>
+      <point x="532" y="860"/>
+      <point x="496" y="1084" type="curve"/>
+      <point x="-24" y="984" type="line"/>
+    </contour>
+    <contour>
+      <point x="-16" y="880" type="move" name="_markrhotichook"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/ringhalfright.glif b/src/Inter-UI-Regular.ufo/glyphs/ringhalfright.glif
index 9f0b8438a..e30818b4f 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/ringhalfright.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/ringhalfright.glif
@@ -3,12 +3,6 @@
   <advance width="480"/>
   <unicode hex="02BE"/>
   <outline>
-    <contour>
-      <point x="140" y="1584" type="move" name="_top"/>
-    </contour>
-    <contour>
-      <point x="-68" y="1584" type="move" name="_rhalfring"/>
-    </contour>
     <contour>
       <point x="100" y="1528" type="line"/>
       <point x="256" y="1528"/>
@@ -25,6 +19,12 @@
       <point x="176" y="1652"/>
       <point x="100" y="1652" type="curve"/>
     </contour>
+    <contour>
+      <point x="140" y="1584" type="move" name="_top"/>
+    </contour>
+    <contour>
+      <point x="212" y="1584" type="move" name="_rhalfring"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/ringrighthalfsubnosp.glif b/src/Inter-UI-Regular.ufo/glyphs/ringrighthalfsubnosp.glif
index 52198fe28..f91381b91 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/ringrighthalfsubnosp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/ringrighthalfsubnosp.glif
@@ -3,13 +3,13 @@
   <advance width="0"/>
   <unicode hex="0339"/>
   <outline>
+    <component base="ringhalfright" xOffset="-1005" yOffset="-2186"/>
     <contour>
       <point x="-858" y="-659" type="move" name="mkmkbottom_acc"/>
     </contour>
     <contour>
       <point x="-858" y="0" type="move" name="_markbottom"/>
     </contour>
-    <component base="ringhalfright" xOffset="-1005" yOffset="-2186"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni0357.glif b/src/Inter-UI-Regular.ufo/glyphs/uni0357.glif
index 95f5267e1..c6a1e93b8 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni0357.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni0357.glif
@@ -3,13 +3,13 @@
   <advance width="0"/>
   <unicode hex="0357"/>
   <outline>
+    <component base="ringhalfright" xOffset="-1005"/>
     <contour>
       <point x="-880" y="1526" type="move" name="_marktop"/>
     </contour>
     <contour>
       <point x="-880" y="2129" type="move" name="mkmktop"/>
     </contour>
-    <component base="ringhalfright" xOffset="-1005"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni04CD__.glif b/src/Inter-UI-Regular.ufo/glyphs/uni04CD__.glif
index 21807d91f..a4392a6b0 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni04CD__.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni04CD__.glif
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni04CD" format="1">
-  <advance width="2784"/>
+  <advance width="2404"/>
   <unicode hex="04CD"/>
   <outline>
-    <component base="M" xOffset="-16"/>
-    <component base="comma" xOffset="2032" yOffset="-100"/>
+    <component base="M"/>
+    <component base="comma" xOffset="1800" yOffset="-100"/>
     <contour>
-      <point x="2448" y="2200" type="move" name="top_dd"/>
+      <point x="2464" y="2200" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="2448" y="-560" type="move" name="bottom_dd"/>
+      <point x="2464" y="-560" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="2448" y="2200" type="move" name="top0315"/>
+      <point x="2464" y="2200" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/groups.plist b/src/Inter-UI-Regular.ufo/groups.plist
index e5c29da2e..f63ea471e 100644
--- a/src/Inter-UI-Regular.ufo/groups.plist
+++ b/src/Inter-UI-Regular.ufo/groups.plist
@@ -864,6 +864,7 @@
 	<array>
 		<string>ae</string>
 		<string>a</string>
+		<string>a_uni02DE</string>
 		<string>agrave</string>
 		<string>aacute</string>
 		<string>acircumflex</string>
diff --git a/src/Inter-UI-Regular.ufo/lib.plist b/src/Inter-UI-Regular.ufo/lib.plist
index 08c9fc348..dc6c72f2c 100644
--- a/src/Inter-UI-Regular.ufo/lib.plist
+++ b/src/Inter-UI-Regular.ufo/lib.plist
@@ -410,6 +410,7 @@
 				<string>afii10148</string>
 				<string>afii10051</string>
 				<string>a</string>
+				<string>a_uni02DE</string>
 				<string>ae</string>
 				<string>b</string>
 				<string>c</string>
@@ -1505,7 +1506,6 @@
 				<string>acuterightnosp</string>
 				<string>barmidlongnosp</string>
 				<string>uni02E6_uni02E6_uni02E9</string>
-				<string>a_uni02DE</string>
 				<string>tildevertsupnosp</string>
 				<string>dotmacroncomb</string>
 				<string>linevertdblnosp</string>
@@ -1872,6 +1872,7 @@
 		<string>afii10148</string>
 		<string>afii10051</string>
 		<string>a</string>
+		<string>a_uni02DE</string>
 		<string>ae</string>
 		<string>b</string>
 		<string>c</string>
@@ -2967,7 +2968,6 @@
 		<string>acuterightnosp</string>
 		<string>barmidlongnosp</string>
 		<string>uni02E6_uni02E6_uni02E9</string>
-		<string>a_uni02DE</string>
 		<string>tildevertsupnosp</string>
 		<string>dotmacroncomb</string>
 		<string>linevertdblnosp</string>
diff --git a/src/glyphorder.txt b/src/glyphorder.txt
index 9768ebf33..5e36cbf3e 100644
--- a/src/glyphorder.txt
+++ b/src/glyphorder.txt
@@ -17,30 +17,30 @@ H
 Hcedilla
 Gbar
 Hbar
+uni04C9
 I
 Idieresisacute
-Itildebelow
 Enhookcyrillic
-J
+Itildebelow
 Endescendercyrillic
+J
 K
-uni04C9
-Kacyr
 Enghecyrillic
+Kacyr
 L
 Lslash
 M
+uni04CD
 N
-afii10026
-uni048A
 Kabashkircyrillic
-O
+afii10026
 Kadescendercyrillic
+uni048A
+O
 Oslash
 Ohorn
 Theta
 P
-uni04CD
 uni048E
 Q
 R
@@ -50,9 +50,9 @@ T
 U
 Uhorn
 V
+response
 W
 X
-response
 Y
 Z
 Thorn
@@ -60,11 +60,11 @@ Gamma
 Delta
 Xi
 Pi
-Sigma
-Phi
 Hadescendercyrillic
-Psi
+Sigma
 uni04FC
+Phi
+Psi
 Omega
 afii10018
 afii10050
@@ -269,18 +269,18 @@ one.tnum
 two
 two.tnum
 three
-four
 three.tnum
+four
 four.1
 four.tnum.1
 five
 six
-six.1
 five.tnum
+six.1
 six.tnum.1
 seven
-seven.tnum
 six.tnum
+seven.tnum
 eight
 nine
 nine.1
@@ -548,8 +548,8 @@ uni02E7_uni02E8
 uni02E7_uni02E5
 uni02E7_uni02E6
 ringacute
-ubar
 romantwelve
+ubar
 uni1DD8
 uni1DD9
 uni1DD2
@@ -796,8 +796,8 @@ thook
 uni03D7
 uni27EF
 finaltsadi
-glottalstop
 rdescend
+glottalstop
 uni02E5_uni02E7
 uni02E5_uni02E9
 uni02E5_uni02E8
@@ -805,8 +805,8 @@ lbelt
 uni0359
 uni0358
 epsilon1revclosed
-uni0355
 uni02E9_uni02E7_uni02E7
+uni0355
 uni0354
 uni0357
 uni0356
@@ -852,8 +852,8 @@ uni1DD6
 uni1DD7
 oneeighth
 linevertsubnosp
-mcapturn
 uni1DCE
+mcapturn
 st
 zbar
 Rx
@@ -872,8 +872,8 @@ spaceopenbox
 uni02E8_uni02E7_uni02E7
 uni02E9_uni02E9_uni02E8
 uni02E8_uni02E7_uni02E5
-uni02E8_uni02E5_uni02E9
 uni02E6_uni02E5_uni02E7
+uni02E8_uni02E5_uni02E9
 uni02E8_uni02E5_uni02E8
 uni02E8_uni02E5_uni02E5
 uni02E8_uni02E5_uni02E7
@@ -914,8 +914,8 @@ tonebarhighmod
 tonebarmidmod
 tonebarlowmod
 tonebarextralowmod
-Fturn
 schwa
+Fturn
 uni023F
 p.cn
 uni023E
@@ -931,8 +931,8 @@ careof
 phi1
 uni02E5_uni02E5_uni02E8
 uni02E5_uni02E5_uni02E9
-phook.cn
 uni02E6_uni02E7
+phook.cn
 breveacutecomb
 mhook
 wynn
@@ -1087,8 +1087,8 @@ iota1
 uni02E6_uni02E8
 uni02E6_uni02E9
 uni1DC9
-uni1DC8
 uniE001
+uni1DC8
 uni1DC7
 uni02E6_uni02E5
 uni1DC5
@@ -1177,8 +1177,8 @@ uni02E5_uni02E8_uni02E5
 uni02E5_uni02E8_uni02E7
 uni02E5_uni02E8_uni02E6
 d.cn
-uni035A
 uni1DE4
+uni035A
 uni02E5_uni02E8_uni02E9
 uni02E5_uni02E8_uni02E8
 uni02E6_uni02E6_uni02E5