diff --git a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/E_th.glif b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/E_th.glif
index 5078aa8bea..69a6797dd8 100644
--- a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/E_th.glif
+++ b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/E_th.glif
@@ -4,13 +4,11 @@
 	<advance width="600"/>
 	<outline>
 		<contour>
-			<point x="298" y="338" type="curve"/>
+			<point x="298" y="338" type="line"/>
 			<point x="304" y="364" type="line"/>
 			<point x="104" y="364" type="line"/>
 			<point x="24" y="362" type="line"/>
 			<point x="18" y="338" type="line"/>
-			<point x="18" y="338"/>
-			<point x="298" y="338"/>
 		</contour>
 		<component base="D"/>
 		<contour>
diff --git a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/S_chwa.glif b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/S_chwa.glif
index ad52d2b730..3e4ff697bd 100644
--- a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/S_chwa.glif
+++ b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/S_chwa.glif
@@ -27,13 +27,9 @@
 			<point x="113" y="14"/>
 			<point x="78" y="134"/>
 			<point x="99" y="301" type="curve"/>
-			<point x="99" y="301"/>
-			<point x="526" y="301"/>
-			<point x="526" y="301" type="curve"/>
+			<point x="526" y="301" type="line"/>
 			<point x="531" y="327" type="line"/>
-			<point x="531" y="327"/>
-			<point x="74" y="327"/>
-			<point x="74" y="327" type="curve"/>
+			<point x="74" y="327" type="line"/>
 			<point x="67" y="285"/>
 			<point x="64" y="248"/>
 			<point x="64" y="215" type="curve" smooth="yes"/>
diff --git a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/W_.glif b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/W_.glif
index 710c8a009c..a6a4c624a2 100644
--- a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/W_.glif
+++ b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/W_.glif
@@ -19,7 +19,9 @@
 			<point x="629" y="660" type="line"/>
 			<point x="601" y="660" type="line"/>
 			<point x="440" y="147" type="line" smooth="yes"/>
-			<point x="407" y="26" type="line"/>
+			<point x="431" y="117"/>
+			<point x="415" y="56"/>
+			<point x="407" y="26" type="curve"/>
 			<point x="401" y="26" type="line"/>
 			<point x="398" y="64"/>
 			<point x="387" y="157"/>
@@ -27,7 +29,9 @@
 			<point x="347" y="467" type="line"/>
 			<point x="312" y="467" type="line"/>
 			<point x="160" y="142" type="line" smooth="yes"/>
-			<point x="108" y="20" type="line"/>
+			<point x="148" y="117"/>
+			<point x="121" y="51"/>
+			<point x="108" y="20" type="curve"/>
 			<point x="104" y="20" type="line"/>
 			<point x="104" y="20"/>
 			<point x="108" y="69"/>
diff --git a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/numero.glif b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/numero.glif
index b742b418a9..d91d8809b7 100644
--- a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/numero.glif
+++ b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/numero.glif
@@ -13,7 +13,7 @@
 			<point x="112" y="466"/>
 			<point x="136" y="600" type="curve"/>
 			<point x="140" y="600" type="line"/>
-			<point x="162" y="416" type="line" smooth="yes"/>
+			<point x="162" y="416" type="line"/>
 			<point x="212" y="0" type="line"/>
 			<point x="252" y="0" type="line"/>
 			<point x="368" y="586" type="line" smooth="yes"/>
@@ -32,7 +32,7 @@
 			<point x="260" y="174"/>
 			<point x="236" y="40" type="curve"/>
 			<point x="232" y="40" type="line"/>
-			<point x="210" y="224" type="line" smooth="yes"/>
+			<point x="210" y="224" type="line"/>
 			<point x="160" y="640" type="line"/>
 			<point x="120" y="640" type="line"/>
 			<point x="4" y="54" type="line" smooth="yes"/>
diff --git a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/q.glif b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/q.glif
index b508aefc48..dba0407354 100644
--- a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/q.glif
+++ b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/q.glif
@@ -23,7 +23,9 @@
 			<point x="374" y="26"/>
 			<point x="428" y="78" type="curve"/>
 			<point x="432" y="78" type="line"/>
-			<point x="406" y="-42" type="line"/>
+			<point x="426" y="48"/>
+			<point x="412" y="-11"/>
+			<point x="406" y="-42" type="curve" smooth="yes"/>
 		</contour>
 		<contour>
 			<point x="238" y="14" type="curve" smooth="yes"/>
diff --git a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/servicemark.glif b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/servicemark.glif
index 98db2a3898..ad88493087 100644
--- a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/servicemark.glif
+++ b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/servicemark.glif
@@ -46,14 +46,18 @@
 		<contour>
 			<point x="299" y="370" type="line"/>
 			<point x="329" y="370" type="line"/>
-			<point x="362" y="542" type="line"/>
-			<point x="377" y="638" type="line"/>
+			<point x="362" y="542" type="line" smooth="yes"/>
+			<point x="366" y="564"/>
+			<point x="373" y="614"/>
+			<point x="377" y="638" type="curve"/>
 			<point x="381" y="638" type="line"/>
 			<point x="424" y="418" type="line"/>
 			<point x="453" y="418" type="line"/>
 			<point x="584" y="638" type="line"/>
 			<point x="588" y="638" type="line"/>
-			<point x="565" y="542" type="line"/>
+			<point x="582" y="614"/>
+			<point x="569" y="563"/>
+			<point x="565" y="542" type="curve" smooth="yes"/>
 			<point x="530" y="370" type="line"/>
 			<point x="560" y="370" type="line"/>
 			<point x="621" y="676" type="line"/>
diff --git a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/x.glif b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/x.glif
index 8946ab4e7f..71546647b5 100644
--- a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/x.glif
+++ b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/x.glif
@@ -6,19 +6,27 @@
 		<contour>
 			<point x="30" y="0" type="line"/>
 			<point x="69" y="0" type="line"/>
-			<point x="208" y="147" type="line"/>
-			<point x="281" y="227" type="line"/>
+			<point x="208" y="147" type="line" smooth="yes"/>
+			<point x="226" y="166"/>
+			<point x="263" y="207"/>
+			<point x="281" y="227" type="curve"/>
 			<point x="286" y="227" type="line"/>
-			<point x="336" y="139" type="line"/>
+			<point x="299" y="205"/>
+			<point x="321" y="164"/>
+			<point x="336" y="139" type="curve" smooth="yes"/>
 			<point x="416" y="0" type="line"/>
 			<point x="450" y="0" type="line"/>
 			<point x="303" y="245" type="line"/>
 			<point x="530" y="478" type="line"/>
 			<point x="491" y="478" type="line"/>
-			<point x="366" y="348" type="line"/>
-			<point x="292" y="265" type="line"/>
+			<point x="366" y="348" type="line" smooth="yes"/>
+			<point x="346" y="327"/>
+			<point x="311" y="286"/>
+			<point x="292" y="265" type="curve"/>
 			<point x="288" y="265" type="line"/>
-			<point x="244" y="348" type="line"/>
+			<point x="277" y="286"/>
+			<point x="257" y="325"/>
+			<point x="244" y="348" type="curve" smooth="yes"/>
 			<point x="172" y="478" type="line"/>
 			<point x="139" y="478" type="line"/>
 			<point x="271" y="250" type="line"/>
diff --git a/Italic/Masters/master_1/SourceCode_Regular-Italic.ufo/glyphs/numero.glif b/Italic/Masters/master_1/SourceCode_Regular-Italic.ufo/glyphs/numero.glif
index fe9c58a42b..d465f263d1 100644
--- a/Italic/Masters/master_1/SourceCode_Regular-Italic.ufo/glyphs/numero.glif
+++ b/Italic/Masters/master_1/SourceCode_Regular-Italic.ufo/glyphs/numero.glif
@@ -12,7 +12,7 @@
 			<point x="110" y="417"/>
 			<point x="128" y="546" type="curve"/>
 			<point x="132" y="546" type="line"/>
-			<point x="147" y="384" type="line" smooth="yes"/>
+			<point x="147" y="384" type="line"/>
 			<point x="183" y="0" type="line"/>
 			<point x="266" y="0" type="line"/>
 			<point x="374" y="544" type="line" smooth="yes"/>
@@ -31,7 +31,7 @@
 			<point x="251" y="220"/>
 			<point x="233" y="92" type="curve"/>
 			<point x="229" y="92" type="line"/>
-			<point x="214" y="254" type="line" smooth="yes"/>
+			<point x="214" y="254" type="line"/>
 			<point x="178" y="638" type="line"/>
 			<point x="95" y="638" type="line"/>
 			<point x="-13" y="94" type="line" smooth="yes"/>
@@ -39,7 +39,7 @@
 			<point x="-33" y="52"/>
 			<point x="-52" y="52" type="curve"/>
 			<point x="-56" y="-9" type="line"/>
-			<point x="-50" y="-12"/>
+			<point x="-50" y="-11"/>
 			<point x="-42" y="-12"/>
 		</contour>
 		<contour>
diff --git a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/E_th.glif b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/E_th.glif
index fa3d648406..5adac0f10e 100644
--- a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/E_th.glif
+++ b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/E_th.glif
@@ -3,13 +3,11 @@
 	<advance width="600"/>
 	<outline>
 		<contour>
-			<point x="330" y="298" type="curve"/>
+			<point x="330" y="298" type="line"/>
 			<point x="346" y="374" type="line"/>
 			<point x="84" y="374" type="line"/>
 			<point x="12" y="368" type="line"/>
 			<point x="-2" y="298" type="line"/>
-			<point x="-2" y="298"/>
-			<point x="330" y="298"/>
 		</contour>
 		<component base="D"/>
 		<contour>
diff --git a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/M_.glif b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/M_.glif
index a126328b63..43de1c3319 100644
--- a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/M_.glif
+++ b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/M_.glif
@@ -10,11 +10,15 @@
 			<point x="196" y="406"/>
 			<point x="205" y="496" type="curve"/>
 			<point x="209" y="496" type="line"/>
-			<point x="218" y="296" type="line"/>
+			<point x="211" y="446"/>
+			<point x="214" y="349"/>
+			<point x="218" y="296" type="curve" smooth="yes"/>
 			<point x="228" y="174" type="line"/>
 			<point x="316" y="174" type="line"/>
 			<point x="381" y="312" type="line" smooth="yes"/>
-			<point x="464" y="496" type="line"/>
+			<point x="399" y="350"/>
+			<point x="443" y="450"/>
+			<point x="464" y="496" type="curve"/>
 			<point x="468" y="496" type="line"/>
 			<point x="447" y="423"/>
 			<point x="398" y="258"/>
diff --git a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/T_bar.glif b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/T_bar.glif
index dcfe3b15d8..193fa2eca6 100644
--- a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/T_bar.glif
+++ b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/T_bar.glif
@@ -4,9 +4,7 @@
 	<outline>
 		<contour>
 			<point x="82" y="280" type="line"/>
-			<point x="82" y="280"/>
-			<point x="506" y="280"/>
-			<point x="506" y="280" type="curve"/>
+			<point x="506" y="280" type="line"/>
 			<point x="522" y="356" type="line"/>
 			<point x="168" y="356" type="line"/>
 			<point x="96" y="350" type="line"/>
diff --git a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/eight.dnom.glif b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/eight.dnom.glif
index 8aafe680bb..509503ed97 100644
--- a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/eight.dnom.glif
+++ b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/eight.dnom.glif
@@ -22,10 +22,8 @@
 			<point x="159" y="222" type="curve" smooth="yes"/>
 			<point x="159" y="198"/>
 			<point x="169" y="177"/>
-			<point x="195" y="156" type="curve" smooth="yes"/>
-			<point x="195" y="156"/>
-			<point x="195" y="154"/>
-			<point x="195" y="154" type="curve"/>
+			<point x="195" y="156" type="curve"/>
+			<point x="195" y="154" type="line"/>
 			<point x="157" y="137"/>
 			<point x="124" y="113"/>
 			<point x="124" y="69" type="curve" smooth="yes"/>
diff --git a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/four.cap.glif b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/four.cap.glif
index 4a4aa9602d..ebce063369 100644
--- a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/four.cap.glif
+++ b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/four.cap.glif
@@ -16,9 +16,7 @@
 			<point x="326" y="444"/>
 			<point x="356" y="486"/>
 			<point x="384" y="524" type="curve"/>
-			<point x="384" y="524"/>
-			<point x="388" y="524"/>
-			<point x="388" y="524" type="curve"/>
+			<point x="388" y="524" type="line"/>
 			<point x="378" y="484"/>
 			<point x="366" y="426"/>
 			<point x="356" y="376" type="curve" smooth="yes"/>
diff --git a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/four.glif b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/four.glif
index 9a716a1a75..0af979bb12 100644
--- a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/four.glif
+++ b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/four.glif
@@ -16,9 +16,7 @@
 			<point x="322" y="428"/>
 			<point x="352" y="470"/>
 			<point x="380" y="508" type="curve"/>
-			<point x="380" y="508"/>
-			<point x="384" y="508"/>
-			<point x="384" y="508" type="curve"/>
+			<point x="384" y="508" type="line"/>
 			<point x="374" y="468"/>
 			<point x="362" y="410"/>
 			<point x="352" y="360" type="curve" smooth="yes"/>
diff --git a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/four.onum.glif b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/four.onum.glif
index a6d9179961..6985de6c27 100644
--- a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/four.onum.glif
+++ b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/four.onum.glif
@@ -16,9 +16,7 @@
 			<point x="307" y="373"/>
 			<point x="338" y="416"/>
 			<point x="366" y="454" type="curve"/>
-			<point x="366" y="454"/>
-			<point x="370" y="454"/>
-			<point x="370" y="454" type="curve"/>
+			<point x="370" y="454" type="line"/>
 			<point x="360" y="414"/>
 			<point x="348" y="356"/>
 			<point x="338" y="306" type="curve" smooth="yes"/>
diff --git a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/numbersign.glif b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/numbersign.glif
index e57be50024..4c2708815b 100644
--- a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/numbersign.glif
+++ b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/numbersign.glif
@@ -3,44 +3,28 @@
 	<advance width="600"/>
 	<outline>
 		<contour>
-			<point x="54" y="0" type="curve"/>
+			<point x="54" y="0" type="line"/>
 			<point x="145" y="0" type="line"/>
-			<point x="145" y="0"/>
-			<point x="349" y="650"/>
-			<point x="349" y="650" type="curve"/>
+			<point x="349" y="650" type="line"/>
 			<point x="260" y="650" type="line"/>
-			<point x="260" y="650"/>
-			<point x="54" y="0"/>
 		</contour>
 		<contour>
-			<point x="250" y="0" type="curve"/>
+			<point x="250" y="0" type="line"/>
 			<point x="341" y="0" type="line"/>
-			<point x="341" y="0"/>
-			<point x="538" y="650"/>
-			<point x="538" y="650" type="curve"/>
+			<point x="538" y="650" type="line"/>
 			<point x="448" y="650" type="line"/>
-			<point x="448" y="650"/>
-			<point x="250" y="0"/>
 		</contour>
 		<contour>
 			<point x="97" y="397" type="line"/>
-			<point x="97" y="397"/>
-			<point x="545" y="397"/>
-			<point x="545" y="397" type="curve"/>
+			<point x="545" y="397" type="line"/>
 			<point x="570" y="488" type="line"/>
-			<point x="570" y="488"/>
-			<point x="121" y="488"/>
-			<point x="121" y="488" type="curve"/>
+			<point x="121" y="488" type="line"/>
 		</contour>
 		<contour>
 			<point x="40" y="183" type="line"/>
-			<point x="40" y="183"/>
-			<point x="489" y="183"/>
-			<point x="489" y="183" type="curve"/>
+			<point x="489" y="183" type="line"/>
 			<point x="513" y="274" type="line"/>
-			<point x="513" y="274"/>
-			<point x="64" y="274"/>
-			<point x="64" y="274" type="curve"/>
+			<point x="64" y="274" type="line"/>
 		</contour>
 	</outline>
 </glyph>
diff --git a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/numero.glif b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/numero.glif
index dc28d0449f..5d04a2d953 100644
--- a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/numero.glif
+++ b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/numero.glif
@@ -12,7 +12,7 @@
 			<point x="107" y="334"/>
 			<point x="115" y="452" type="curve"/>
 			<point x="119" y="452" type="line"/>
-			<point x="123" y="354" type="line" smooth="yes"/>
+			<point x="123" y="354" type="line"/>
 			<point x="138" y="0" type="line"/>
 			<point x="289" y="0" type="line"/>
 			<point x="383" y="472" type="line" smooth="yes"/>
@@ -31,7 +31,7 @@
 			<point x="235" y="300"/>
 			<point x="227" y="182" type="curve"/>
 			<point x="223" y="182" type="line"/>
-			<point x="219" y="280" type="line" smooth="yes"/>
+			<point x="219" y="280" type="line"/>
 			<point x="204" y="634" type="line"/>
 			<point x="53" y="634" type="line"/>
 			<point x="-41" y="162" type="line" smooth="yes"/>
diff --git a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/one.a.glif b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/one.a.glif
index 33c414a9a6..51fe4fb976 100644
--- a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/one.a.glif
+++ b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/one.a.glif
@@ -17,11 +17,4 @@
 			<point x="40" y="128" type="line"/>
 		</contour>
 	</outline>
-	<lib>
-		<dict>
-			<key>com.typemytype.robofont.layerData</key>
-			<dict>
-			</dict>
-		</dict>
-	</lib>
 </glyph>
diff --git a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/quotereversed.glif b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/quotereversed.glif
index 655830aa15..3bf0fdf812 100644
--- a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/quotereversed.glif
+++ b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/quotereversed.glif
@@ -7,8 +7,10 @@
 			<point x="434" y="370" type="line"/>
 			<point x="346" y="410"/>
 			<point x="309" y="446"/>
-			<point x="309" y="492" type="curve"/>
-			<point x="315" y="528" type="line"/>
+			<point x="309" y="492" type="curve" smooth="yes"/>
+			<point x="309" y="505"/>
+			<point x="312" y="519"/>
+			<point x="315" y="528" type="curve"/>
 			<point x="330" y="615" type="line"/>
 			<point x="257" y="520" type="line"/>
 			<point x="270" y="505"/>
diff --git a/Roman/Masters/master_0/SourceCode_ExtraLight.ufo/glyphs/dezh.glif b/Roman/Masters/master_0/SourceCode_ExtraLight.ufo/glyphs/dezh.glif
index 47ca67a23b..ab61e237d2 100644
--- a/Roman/Masters/master_0/SourceCode_ExtraLight.ufo/glyphs/dezh.glif
+++ b/Roman/Masters/master_0/SourceCode_ExtraLight.ufo/glyphs/dezh.glif
@@ -12,7 +12,7 @@
 			<point x="284" y="0" type="line"/>
 			<point x="310" y="0" type="line"/>
 			<point x="310" y="722" type="line"/>
-			<point x="280" y="722" type="line" smooth="yes"/>
+			<point x="280" y="722" type="line"/>
 			<point x="280" y="520" type="line"/>
 			<point x="282" y="420" type="line"/>
 			<point x="280" y="420" type="line"/>
diff --git a/Roman/Masters/master_0/SourceCode_ExtraLight.ufo/glyphs/eng.glif b/Roman/Masters/master_0/SourceCode_ExtraLight.ufo/glyphs/eng.glif
index ac8f646c9f..5833b60bda 100644
--- a/Roman/Masters/master_0/SourceCode_ExtraLight.ufo/glyphs/eng.glif
+++ b/Roman/Masters/master_0/SourceCode_ExtraLight.ufo/glyphs/eng.glif
@@ -8,9 +8,7 @@
 			<point x="475" y="-180"/>
 			<point x="510" y="-137"/>
 			<point x="510" y="-38" type="curve" smooth="yes"/>
-			<point x="510" y="-38"/>
-			<point x="510" y="298"/>
-			<point x="510" y="298" type="curve" smooth="yes"/>
+			<point x="510" y="298" type="line" smooth="yes"/>
 			<point x="510" y="429"/>
 			<point x="453" y="490"/>
 			<point x="336" y="490" type="curve" smooth="yes"/>
@@ -29,9 +27,7 @@
 			<point x="437" y="462"/>
 			<point x="480" y="407"/>
 			<point x="480" y="294" type="curve" smooth="yes"/>
-			<point x="480" y="294"/>
-			<point x="480" y="-34"/>
-			<point x="480" y="-34" type="curve" smooth="yes"/>
+			<point x="480" y="-34" type="line" smooth="yes"/>
 			<point x="480" y="-102"/>
 			<point x="468" y="-152"/>
 			<point x="404" y="-152" type="curve" smooth="yes"/>
diff --git a/Roman/Masters/master_0/SourceCode_ExtraLight.ufo/glyphs/numero.glif b/Roman/Masters/master_0/SourceCode_ExtraLight.ufo/glyphs/numero.glif
index 5a1d587eeb..cbacec09c3 100644
--- a/Roman/Masters/master_0/SourceCode_ExtraLight.ufo/glyphs/numero.glif
+++ b/Roman/Masters/master_0/SourceCode_ExtraLight.ufo/glyphs/numero.glif
@@ -14,8 +14,8 @@
 			<point x="82" y="592" type="curve"/>
 			<point x="86" y="592" type="line"/>
 			<point x="102" y="534"/>
-			<point x="122" y="474"/>
-			<point x="142" y="414" type="curve"/>
+			<point x="123" y="474"/>
+			<point x="142" y="414" type="curve" smooth="yes"/>
 			<point x="272" y="0" type="line"/>
 			<point x="316" y="0" type="line"/>
 			<point x="316" y="584" type="line" smooth="yes"/>
diff --git a/Roman/Masters/master_1/SourceCode_Regular.ufo/glyphs/numero.glif b/Roman/Masters/master_1/SourceCode_Regular.ufo/glyphs/numero.glif
index bffc0b7d3d..2133dd7c6c 100644
--- a/Roman/Masters/master_1/SourceCode_Regular.ufo/glyphs/numero.glif
+++ b/Roman/Masters/master_1/SourceCode_Regular.ufo/glyphs/numero.glif
@@ -7,7 +7,7 @@
 			<point x="81" y="-12"/>
 			<point x="104" y="21"/>
 			<point x="104" y="86" type="curve" smooth="yes"/>
-			<point x="104" y="240" type="line"/>
+			<point x="104" y="240" type="line" smooth="yes"/>
 			<point x="104" y="335"/>
 			<point x="94" y="414"/>
 			<point x="84" y="540" type="curve"/>
@@ -15,11 +15,9 @@
 			<point x="98" y="503"/>
 			<point x="114" y="441"/>
 			<point x="125" y="403" type="curve" smooth="yes"/>
-			<point x="138" y="356"/>
-			<point x="230" y="45"/>
-			<point x="242" y="0" type="curve"/>
+			<point x="242" y="0" type="line"/>
 			<point x="330" y="0" type="line"/>
-			<point x="330" y="540" type="line"/>
+			<point x="330" y="540" type="line" smooth="yes"/>
 			<point x="330" y="573"/>
 			<point x="340" y="582"/>
 			<point x="359" y="582" type="curve"/>
@@ -30,19 +28,17 @@
 			<point x="280" y="650"/>
 			<point x="258" y="617"/>
 			<point x="258" y="551" type="curve" smooth="yes"/>
-			<point x="258" y="398" type="line"/>
+			<point x="258" y="398" type="line" smooth="yes"/>
 			<point x="258" y="303"/>
 			<point x="268" y="224"/>
 			<point x="277" y="98" type="curve"/>
 			<point x="273" y="98" type="line"/>
 			<point x="262" y="136"/>
-			<point x="248" y="198"/>
+			<point x="247" y="198"/>
 			<point x="236" y="236" type="curve" smooth="yes"/>
-			<point x="225" y="283"/>
-			<point x="132" y="593"/>
-			<point x="118" y="638" type="curve"/>
+			<point x="119" y="638" type="line"/>
 			<point x="32" y="638" type="line"/>
-			<point x="32" y="98" type="line"/>
+			<point x="32" y="98" type="line" smooth="yes"/>
 			<point x="32" y="65"/>
 			<point x="22" y="56"/>
 			<point x="2" y="56" type="curve"/>
diff --git a/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/commaabovecmb.glif b/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/commaabovecmb.glif
index 99086657f7..63e085e7b0 100644
--- a/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/commaabovecmb.glif
+++ b/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/commaabovecmb.glif
@@ -20,9 +20,7 @@
 			<point x="312" y="677"/>
 			<point x="324" y="687" type="curve"/>
 			<point x="290" y="743" type="line"/>
-			<point x="291" y="724"/>
-			<point x="306" y="704"/>
-			<point x="305" y="683" type="curve" smooth="yes"/>
+			<point x="305" y="683" type="line"/>
 			<point x="304" y="652"/>
 			<point x="277" y="634"/>
 			<point x="226" y="620" type="curve"/>
diff --git a/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/commaturnedabovecmb.glif b/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/commaturnedabovecmb.glif
index 03c110eae3..77329cee40 100644
--- a/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/commaturnedabovecmb.glif
+++ b/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/commaturnedabovecmb.glif
@@ -14,9 +14,7 @@
 			<point x="288" y="695"/>
 			<point x="276" y="685" type="curve"/>
 			<point x="310" y="629" type="line"/>
-			<point x="309" y="648"/>
-			<point x="294" y="668"/>
-			<point x="295" y="689" type="curve" smooth="yes"/>
+			<point x="295" y="689" type="line"/>
 			<point x="296" y="720"/>
 			<point x="323" y="738"/>
 			<point x="374" y="752" type="curve"/>
diff --git a/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/dezh.glif b/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/dezh.glif
index 13d5cb7e30..e0e3c3321a 100644
--- a/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/dezh.glif
+++ b/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/dezh.glif
@@ -47,7 +47,9 @@
 			<point x="618" y="154"/>
 			<point x="560" y="234"/>
 			<point x="466" y="238" type="curve"/>
-			<point x="474" y="218" type="line"/>
+			<point x="447" y="238"/>
+			<point x="434" y="224"/>
+			<point x="428" y="214" type="curve"/>
 			<point x="482" y="198" type="line"/>
 			<point x="596" y="408" type="line"/>
 			<point x="596" y="500" type="line"/>
@@ -56,7 +58,7 @@
 			<point x="444" y="366" type="line"/>
 			<point x="348" y="204" type="line"/>
 			<point x="398" y="112" type="line"/>
-			<point x="410" y="118"/>
+			<point x="407" y="117"/>
 			<point x="412" y="118"/>
 			<point x="420" y="118" type="curve" smooth="yes"/>
 			<point x="446" y="118"/>
diff --git a/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/numero.glif b/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/numero.glif
index ea62bb716d..bac66560b5 100644
--- a/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/numero.glif
+++ b/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/numero.glif
@@ -12,10 +12,10 @@
 			<point x="104" y="332"/>
 			<point x="88" y="451" type="curve"/>
 			<point x="92" y="451" type="line"/>
-			<point x="108" y="384" type="line" smooth="yes"/>
-			<point x="139" y="256"/>
-			<point x="170" y="122"/>
-			<point x="200" y="0" type="curve"/>
+			<point x="96" y="434"/>
+			<point x="102" y="411"/>
+			<point x="108" y="384" type="curve" smooth="yes"/>
+			<point x="197" y="0" type="line"/>
 			<point x="354" y="0" type="line"/>
 			<point x="354" y="464" type="line" smooth="yes"/>
 			<point x="354" y="502"/>
@@ -33,10 +33,10 @@
 			<point x="240" y="302"/>
 			<point x="256" y="183" type="curve"/>
 			<point x="252" y="183" type="line"/>
-			<point x="236" y="250" type="line" smooth="yes"/>
-			<point x="205" y="378"/>
-			<point x="175" y="512"/>
-			<point x="138" y="634" type="curve"/>
+			<point x="248" y="200"/>
+			<point x="241" y="230"/>
+			<point x="236" y="250" type="curve" smooth="yes"/>
+			<point x="141" y="634" type="line"/>
 			<point x="-10" y="634" type="line"/>
 			<point x="-10" y="170" type="line" smooth="yes"/>
 			<point x="-10" y="132"/>