diff --git a/src/main/dig/74xx/counter.dig b/src/main/dig/74xx/counter.dig
index 761740e85..fd3d6dc39 100644
--- a/src/main/dig/74xx/counter.dig
+++ b/src/main/dig/74xx/counter.dig
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <circuit>
   <version>1</version>
-  <attributes/>
+  <attributes>
+    <entry>
+      <string>Description</string>
+      <string>Three digit BCD counter.</string>
+    </entry>
+  </attributes>
   <visualElements>
     <visualElement>
       <elementName>7447.dig</elementName>
@@ -110,12 +115,16 @@
           <string>runRealTime</string>
           <boolean>true</boolean>
         </entry>
+        <entry>
+          <string>Label</string>
+          <string>C</string>
+        </entry>
         <entry>
           <string>Frequency</string>
-          <int>10</int>
+          <int>2</int>
         </entry>
       </elementAttributes>
-      <pos x="-260" y="-380"/>
+      <pos x="-260" y="-360"/>
     </visualElement>
     <visualElement>
       <elementName>VDD</elementName>
@@ -189,12 +198,16 @@
       <p2 x="20" y="-100"/>
     </wire>
     <wire>
-      <p1 x="-220" y="-360"/>
-      <p2 x="140" y="-360"/>
+      <p1 x="-260" y="-360"/>
+      <p2 x="-20" y="-360"/>
     </wire>
     <wire>
-      <p1 x="140" y="-360"/>
-      <p2 x="780" y="-360"/>
+      <p1 x="340" y="-360"/>
+      <p2 x="700" y="-360"/>
+    </wire>
+    <wire>
+      <p1 x="-20" y="-360"/>
+      <p2 x="340" y="-360"/>
     </wire>
     <wire>
       <p1 x="600" y="360"/>
@@ -273,16 +286,12 @@
       <p2 x="-120" y="120"/>
     </wire>
     <wire>
-      <p1 x="-260" y="-380"/>
-      <p2 x="-20" y="-380"/>
+      <p1 x="-220" y="-380"/>
+      <p2 x="140" y="-380"/>
     </wire>
     <wire>
-      <p1 x="340" y="-380"/>
-      <p2 x="700" y="-380"/>
-    </wire>
-    <wire>
-      <p1 x="-20" y="-380"/>
-      <p2 x="340" y="-380"/>
+      <p1 x="140" y="-380"/>
+      <p2 x="780" y="-380"/>
     </wire>
     <wire>
       <p1 x="-100" y="-60"/>
@@ -453,11 +462,11 @@
       <p2 x="-140" y="-300"/>
     </wire>
     <wire>
-      <p1 x="780" y="-360"/>
+      <p1 x="780" y="-380"/>
       <p2 x="780" y="-160"/>
     </wire>
     <wire>
-      <p1 x="140" y="-360"/>
+      <p1 x="140" y="-380"/>
       <p2 x="140" y="-300"/>
     </wire>
     <wire>
@@ -489,7 +498,7 @@
       <p2 x="-20" y="-20"/>
     </wire>
     <wire>
-      <p1 x="-20" y="-380"/>
+      <p1 x="-20" y="-360"/>
       <p2 x="-20" y="-300"/>
     </wire>
     <wire>
@@ -501,7 +510,7 @@
       <p2 x="340" y="-20"/>
     </wire>
     <wire>
-      <p1 x="340" y="-380"/>
+      <p1 x="340" y="-360"/>
       <p2 x="340" y="-300"/>
     </wire>
     <wire>
@@ -541,7 +550,7 @@
       <p2 x="600" y="360"/>
     </wire>
     <wire>
-      <p1 x="-220" y="-360"/>
+      <p1 x="-220" y="-380"/>
       <p2 x="-220" y="-300"/>
     </wire>
     <wire>
@@ -781,7 +790,7 @@
       <p2 x="700" y="-20"/>
     </wire>
     <wire>
-      <p1 x="700" y="-380"/>
+      <p1 x="700" y="-360"/>
       <p2 x="700" y="-300"/>
     </wire>
     <wire>
diff --git a/src/main/dig/74xx/lib/74162.dig b/src/main/dig/74xx/lib/74162.dig
index 6b06d8f25..d1205aab9 100644
--- a/src/main/dig/74xx/lib/74162.dig
+++ b/src/main/dig/74xx/lib/74162.dig
@@ -11,16 +11,29 @@
       <string>Presettable synchronous BCD decade
 counter; synchronous reset</string>
     </entry>
+    <entry>
+      <string>Color</string>
+      <awt-color>
+        <red>255</red>
+        <green>255</green>
+        <blue>153</blue>
+        <alpha>255</alpha>
+      </awt-color>
+    </entry>
   </attributes>
   <visualElements>
     <visualElement>
       <elementName>D_FF</elementName>
       <elementAttributes/>
-      <pos x="280" y="380"/>
+      <pos x="280" y="320"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
       <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>flip-flop outputs</string>
+        </entry>
         <entry>
           <string>rotation</string>
           <rotation rotation="3"/>
@@ -34,7 +47,7 @@ counter; synchronous reset</string>
           <int>14</int>
         </entry>
       </elementAttributes>
-      <pos x="360" y="540"/>
+      <pos x="360" y="420"/>
     </visualElement>
     <visualElement>
       <elementName>Or</elementName>
@@ -44,7 +57,7 @@ counter; synchronous reset</string>
           <rotation rotation="3"/>
         </entry>
       </elementAttributes>
-      <pos x="280" y="280"/>
+      <pos x="280" y="220"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
@@ -54,7 +67,7 @@ counter; synchronous reset</string>
           <rotation rotation="3"/>
         </entry>
       </elementAttributes>
-      <pos x="240" y="180"/>
+      <pos x="240" y="120"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
@@ -64,16 +77,20 @@ counter; synchronous reset</string>
           <rotation rotation="3"/>
         </entry>
       </elementAttributes>
-      <pos x="320" y="180"/>
+      <pos x="320" y="120"/>
     </visualElement>
     <visualElement>
       <elementName>D_FF</elementName>
       <elementAttributes/>
-      <pos x="540" y="380"/>
+      <pos x="540" y="320"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
       <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>flip-flop outputs</string>
+        </entry>
         <entry>
           <string>rotation</string>
           <rotation rotation="3"/>
@@ -87,7 +104,7 @@ counter; synchronous reset</string>
           <int>13</int>
         </entry>
       </elementAttributes>
-      <pos x="640" y="540"/>
+      <pos x="640" y="420"/>
     </visualElement>
     <visualElement>
       <elementName>Or</elementName>
@@ -97,7 +114,7 @@ counter; synchronous reset</string>
           <rotation rotation="3"/>
         </entry>
       </elementAttributes>
-      <pos x="540" y="280"/>
+      <pos x="540" y="220"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
@@ -107,7 +124,7 @@ counter; synchronous reset</string>
           <rotation rotation="3"/>
         </entry>
       </elementAttributes>
-      <pos x="500" y="180"/>
+      <pos x="500" y="120"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
@@ -117,16 +134,20 @@ counter; synchronous reset</string>
           <rotation rotation="3"/>
         </entry>
       </elementAttributes>
-      <pos x="580" y="180"/>
+      <pos x="580" y="120"/>
     </visualElement>
     <visualElement>
       <elementName>D_FF</elementName>
       <elementAttributes/>
-      <pos x="800" y="380"/>
+      <pos x="800" y="320"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
       <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>flip-flop outputs</string>
+        </entry>
         <entry>
           <string>rotation</string>
           <rotation rotation="3"/>
@@ -140,7 +161,7 @@ counter; synchronous reset</string>
           <int>12</int>
         </entry>
       </elementAttributes>
-      <pos x="900" y="540"/>
+      <pos x="900" y="420"/>
     </visualElement>
     <visualElement>
       <elementName>Or</elementName>
@@ -150,7 +171,7 @@ counter; synchronous reset</string>
           <rotation rotation="3"/>
         </entry>
       </elementAttributes>
-      <pos x="800" y="280"/>
+      <pos x="800" y="220"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
@@ -160,7 +181,7 @@ counter; synchronous reset</string>
           <rotation rotation="3"/>
         </entry>
       </elementAttributes>
-      <pos x="760" y="180"/>
+      <pos x="760" y="120"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
@@ -170,16 +191,20 @@ counter; synchronous reset</string>
           <rotation rotation="3"/>
         </entry>
       </elementAttributes>
-      <pos x="840" y="180"/>
+      <pos x="840" y="120"/>
     </visualElement>
     <visualElement>
       <elementName>D_FF</elementName>
       <elementAttributes/>
-      <pos x="1060" y="380"/>
+      <pos x="1060" y="320"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
       <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>flip-flop outputs</string>
+        </entry>
         <entry>
           <string>rotation</string>
           <rotation rotation="3"/>
@@ -193,7 +218,7 @@ counter; synchronous reset</string>
           <int>11</int>
         </entry>
       </elementAttributes>
-      <pos x="1160" y="540"/>
+      <pos x="1160" y="420"/>
     </visualElement>
     <visualElement>
       <elementName>Or</elementName>
@@ -203,7 +228,7 @@ counter; synchronous reset</string>
           <rotation rotation="3"/>
         </entry>
       </elementAttributes>
-      <pos x="1060" y="280"/>
+      <pos x="1060" y="220"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
@@ -213,7 +238,7 @@ counter; synchronous reset</string>
           <rotation rotation="3"/>
         </entry>
       </elementAttributes>
-      <pos x="1020" y="180"/>
+      <pos x="1020" y="120"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
@@ -223,26 +248,30 @@ counter; synchronous reset</string>
           <rotation rotation="3"/>
         </entry>
       </elementAttributes>
-      <pos x="1100" y="180"/>
+      <pos x="1100" y="120"/>
     </visualElement>
     <visualElement>
       <elementName>NOr</elementName>
       <elementAttributes/>
-      <pos x="80" y="140"/>
+      <pos x="80" y="80"/>
     </visualElement>
     <visualElement>
       <elementName>NOr</elementName>
       <elementAttributes/>
-      <pos x="-40" y="120"/>
+      <pos x="-40" y="60"/>
     </visualElement>
     <visualElement>
       <elementName>Not</elementName>
       <elementAttributes/>
-      <pos x="-20" y="200"/>
+      <pos x="-20" y="140"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>Reset</string>
+        </entry>
         <entry>
           <string>Label</string>
           <string>~MR</string>
@@ -251,12 +280,20 @@ counter; synchronous reset</string>
           <string>pinNumber</string>
           <int>1</int>
         </entry>
+        <entry>
+          <string>Default</string>
+          <int>1</int>
+        </entry>
       </elementAttributes>
-      <pos x="-80" y="200"/>
+      <pos x="-80" y="140"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>parallel enable input (active LOW)</string>
+        </entry>
         <entry>
           <string>Label</string>
           <string>~PE</string>
@@ -265,22 +302,20 @@ counter; synchronous reset</string>
           <string>pinNumber</string>
           <int>9</int>
         </entry>
-      </elementAttributes>
-      <pos x="-80" y="120"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Not</elementName>
-      <elementAttributes>
         <entry>
-          <string>rotation</string>
-          <rotation rotation="3"/>
+          <string>Default</string>
+          <int>1</int>
         </entry>
       </elementAttributes>
-      <pos x="200" y="-380"/>
+      <pos x="-80" y="60"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>data inputs</string>
+        </entry>
         <entry>
           <string>rotation</string>
           <rotation rotation="3"/>
@@ -294,21 +329,15 @@ counter; synchronous reset</string>
           <int>3</int>
         </entry>
       </elementAttributes>
-      <pos x="200" y="-400"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Not</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="3"/>
-        </entry>
-      </elementAttributes>
-      <pos x="460" y="-380"/>
+      <pos x="200" y="-360"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>data inputs</string>
+        </entry>
         <entry>
           <string>rotation</string>
           <rotation rotation="3"/>
@@ -322,21 +351,15 @@ counter; synchronous reset</string>
           <int>4</int>
         </entry>
       </elementAttributes>
-      <pos x="460" y="-400"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Not</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="3"/>
-        </entry>
-      </elementAttributes>
-      <pos x="720" y="-380"/>
+      <pos x="460" y="-360"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>data inputs</string>
+        </entry>
         <entry>
           <string>rotation</string>
           <rotation rotation="3"/>
@@ -350,21 +373,15 @@ counter; synchronous reset</string>
           <int>5</int>
         </entry>
       </elementAttributes>
-      <pos x="720" y="-400"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Not</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="3"/>
-        </entry>
-      </elementAttributes>
-      <pos x="980" y="-380"/>
+      <pos x="720" y="-360"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>data inputs</string>
+        </entry>
         <entry>
           <string>rotation</string>
           <rotation rotation="3"/>
@@ -378,11 +395,15 @@ counter; synchronous reset</string>
           <int>6</int>
         </entry>
       </elementAttributes>
-      <pos x="980" y="-400"/>
+      <pos x="980" y="-360"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>Clock</string>
+        </entry>
         <entry>
           <string>Label</string>
           <string>CP</string>
@@ -392,7 +413,7 @@ counter; synchronous reset</string>
           <int>2</int>
         </entry>
       </elementAttributes>
-      <pos x="-80" y="460"/>
+      <pos x="-80" y="400"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
@@ -406,11 +427,15 @@ counter; synchronous reset</string>
           <int>5</int>
         </entry>
       </elementAttributes>
-      <pos x="1380" y="400"/>
+      <pos x="1380" y="340"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
       <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>terminal count output</string>
+        </entry>
         <entry>
           <string>rotation</string>
           <rotation rotation="3"/>
@@ -424,11 +449,15 @@ counter; synchronous reset</string>
           <int>15</int>
         </entry>
       </elementAttributes>
-      <pos x="1340" y="540"/>
+      <pos x="1340" y="420"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>count enable carry input</string>
+        </entry>
         <entry>
           <string>Label</string>
           <string>CET</string>
@@ -437,6 +466,10 @@ counter; synchronous reset</string>
           <string>pinNumber</string>
           <int>10</int>
         </entry>
+        <entry>
+          <string>Default</string>
+          <int>1</int>
+        </entry>
       </elementAttributes>
       <pos x="-80" y="-320"/>
     </visualElement>
@@ -448,6 +481,10 @@ counter; synchronous reset</string>
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>count enable input</string>
+        </entry>
         <entry>
           <string>Label</string>
           <string>CEP</string>
@@ -456,6 +493,10 @@ counter; synchronous reset</string>
           <string>pinNumber</string>
           <int>7</int>
         </entry>
+        <entry>
+          <string>Default</string>
+          <int>1</int>
+        </entry>
       </elementAttributes>
       <pos x="-80" y="-200"/>
     </visualElement>
@@ -467,7 +508,7 @@ counter; synchronous reset</string>
           <rotation rotation="3"/>
         </entry>
       </elementAttributes>
-      <pos x="300" y="-20"/>
+      <pos x="300" y="-60"/>
     </visualElement>
     <visualElement>
       <elementName>Not</elementName>
@@ -487,7 +528,7 @@ counter; synchronous reset</string>
           <rotation rotation="3"/>
         </entry>
       </elementAttributes>
-      <pos x="560" y="-20"/>
+      <pos x="560" y="-60"/>
     </visualElement>
     <visualElement>
       <elementName>NOr</elementName>
@@ -511,7 +552,7 @@ counter; synchronous reset</string>
           <rotation rotation="3"/>
         </entry>
       </elementAttributes>
-      <pos x="820" y="-20"/>
+      <pos x="820" y="-60"/>
     </visualElement>
     <visualElement>
       <elementName>NOr</elementName>
@@ -535,7 +576,7 @@ counter; synchronous reset</string>
           <rotation rotation="3"/>
         </entry>
       </elementAttributes>
-      <pos x="1120" y="40"/>
+      <pos x="1120" y="20"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
@@ -545,7 +586,7 @@ counter; synchronous reset</string>
           <rotation rotation="3"/>
         </entry>
       </elementAttributes>
-      <pos x="1080" y="-80"/>
+      <pos x="1080" y="-100"/>
     </visualElement>
     <visualElement>
       <elementName>NOr</elementName>
@@ -555,7 +596,7 @@ counter; synchronous reset</string>
           <rotation rotation="3"/>
         </entry>
       </elementAttributes>
-      <pos x="1160" y="-80"/>
+      <pos x="1160" y="-100"/>
     </visualElement>
     <visualElement>
       <elementName>NOr</elementName>
@@ -594,28 +635,48 @@ counter; synchronous reset</string>
   </visualElements>
   <wires>
     <wire>
-      <p1 x="-60" y="160"/>
-      <p2 x="-40" y="160"/>
+      <p1 x="1060" y="0"/>
+      <p2 x="1080" y="0"/>
     </wire>
     <wire>
-      <p1 x="160" y="160"/>
-      <p2 x="320" y="160"/>
+      <p1 x="1120" y="0"/>
+      <p2 x="1140" y="0"/>
     </wire>
     <wire>
-      <p1 x="840" y="160"/>
-      <p2 x="1060" y="160"/>
+      <p1 x="340" y="320"/>
+      <p2 x="360" y="320"/>
     </wire>
     <wire>
-      <p1 x="580" y="160"/>
-      <p2 x="840" y="160"/>
+      <p1 x="260" y="320"/>
+      <p2 x="280" y="320"/>
     </wire>
     <wire>
-      <p1 x="320" y="160"/>
-      <p2 x="580" y="160"/>
+      <p1 x="600" y="320"/>
+      <p2 x="640" y="320"/>
     </wire>
     <wire>
-      <p1 x="660" y="480"/>
-      <p2 x="1140" y="480"/>
+      <p1 x="520" y="320"/>
+      <p2 x="540" y="320"/>
+    </wire>
+    <wire>
+      <p1 x="860" y="320"/>
+      <p2 x="900" y="320"/>
+    </wire>
+    <wire>
+      <p1 x="780" y="320"/>
+      <p2 x="800" y="320"/>
+    </wire>
+    <wire>
+      <p1 x="1120" y="320"/>
+      <p2 x="1160" y="320"/>
+    </wire>
+    <wire>
+      <p1 x="1040" y="320"/>
+      <p2 x="1060" y="320"/>
+    </wire>
+    <wire>
+      <p1 x="1160" y="320"/>
+      <p2 x="1300" y="320"/>
     </wire>
     <wire>
       <p1 x="620" y="-260"/>
@@ -629,77 +690,69 @@ counter; synchronous reset</string>
       <p1 x="780" y="-260"/>
       <p2 x="1060" y="-260"/>
     </wire>
-    <wire>
-      <p1 x="1080" y="-100"/>
-      <p2 x="1100" y="-100"/>
-    </wire>
     <wire>
       <p1 x="1200" y="-100"/>
       <p2 x="1240" y="-100"/>
     </wire>
     <wire>
-      <p1 x="1100" y="-100"/>
-      <p2 x="1120" y="-100"/>
+      <p1 x="-60" y="100"/>
+      <p2 x="-40" y="100"/>
     </wire>
     <wire>
-      <p1 x="220" y="260"/>
-      <p2 x="240" y="260"/>
+      <p1 x="160" y="100"/>
+      <p2 x="320" y="100"/>
     </wire>
     <wire>
-      <p1 x="280" y="260"/>
-      <p2 x="300" y="260"/>
+      <p1 x="840" y="100"/>
+      <p2 x="1060" y="100"/>
     </wire>
     <wire>
-      <p1 x="480" y="260"/>
-      <p2 x="500" y="260"/>
+      <p1 x="320" y="100"/>
+      <p2 x="580" y="100"/>
     </wire>
     <wire>
-      <p1 x="540" y="260"/>
-      <p2 x="560" y="260"/>
-    </wire>
-    <wire>
-      <p1 x="740" y="260"/>
-      <p2 x="760" y="260"/>
-    </wire>
-    <wire>
-      <p1 x="800" y="260"/>
-      <p2 x="820" y="260"/>
-    </wire>
-    <wire>
-      <p1 x="1000" y="260"/>
-      <p2 x="1020" y="260"/>
-    </wire>
-    <wire>
-      <p1 x="1060" y="260"/>
-      <p2 x="1080" y="260"/>
-    </wire>
-    <wire>
-      <p1 x="60" y="100"/>
-      <p2 x="240" y="100"/>
+      <p1 x="580" y="100"/>
+      <p2 x="840" y="100"/>
     </wire>
     <wire>
       <p1 x="-80" y="-200"/>
       <p2 x="-40" y="-200"/>
     </wire>
     <wire>
-      <p1 x="300" y="-40"/>
-      <p2 x="380" y="-40"/>
+      <p1 x="220" y="200"/>
+      <p2 x="240" y="200"/>
     </wire>
     <wire>
-      <p1 x="560" y="-40"/>
-      <p2 x="620" y="-40"/>
+      <p1 x="280" y="200"/>
+      <p2 x="300" y="200"/>
     </wire>
     <wire>
-      <p1 x="820" y="-40"/>
-      <p2 x="880" y="-40"/>
+      <p1 x="480" y="200"/>
+      <p2 x="500" y="200"/>
     </wire>
     <wire>
-      <p1 x="20" y="200"/>
-      <p2 x="40" y="200"/>
+      <p1 x="540" y="200"/>
+      <p2 x="560" y="200"/>
     </wire>
     <wire>
-      <p1 x="-80" y="200"/>
-      <p2 x="-20" y="200"/>
+      <p1 x="740" y="200"/>
+      <p2 x="760" y="200"/>
+    </wire>
+    <wire>
+      <p1 x="800" y="200"/>
+      <p2 x="820" y="200"/>
+    </wire>
+    <wire>
+      <p1 x="1000" y="200"/>
+      <p2 x="1020" y="200"/>
+    </wire>
+    <wire>
+      <p1 x="1060" y="200"/>
+      <p2 x="1080" y="200"/>
+    </wire>
+    <wire>
+      <p1 x="60" y="40"/>
+      <p2 x="240" y="40"/>
     </wire>
     <wire>
       <p1 x="360" y="-300"/>
@@ -710,40 +763,24 @@ counter; synchronous reset</string>
       <p2 x="1360" y="-300"/>
     </wire>
     <wire>
-      <p1 x="-80" y="460"/>
-      <p2 x="260" y="460"/>
+      <p1 x="20" y="140"/>
+      <p2 x="40" y="140"/>
     </wire>
     <wire>
-      <p1 x="780" y="460"/>
-      <p2 x="1040" y="460"/>
+      <p1 x="-80" y="140"/>
+      <p2 x="-20" y="140"/>
     </wire>
     <wire>
-      <p1 x="520" y="460"/>
-      <p2 x="780" y="460"/>
+      <p1 x="300" y="-80"/>
+      <p2 x="380" y="-80"/>
     </wire>
     <wire>
-      <p1 x="260" y="460"/>
-      <p2 x="520" y="460"/>
+      <p1 x="560" y="-80"/>
+      <p2 x="620" y="-80"/>
     </wire>
     <wire>
-      <p1 x="40" y="140"/>
-      <p2 x="60" y="140"/>
-    </wire>
-    <wire>
-      <p1 x="240" y="140"/>
-      <p2 x="500" y="140"/>
-    </wire>
-    <wire>
-      <p1 x="760" y="140"/>
-      <p2 x="1020" y="140"/>
-    </wire>
-    <wire>
-      <p1 x="500" y="140"/>
-      <p2 x="760" y="140"/>
-    </wire>
-    <wire>
-      <p1 x="60" y="140"/>
-      <p2 x="80" y="140"/>
+      <p1 x="820" y="-80"/>
+      <p2 x="880" y="-80"/>
     </wire>
     <wire>
       <p1 x="-60" y="-240"/>
@@ -762,52 +799,80 @@ counter; synchronous reset</string>
       <p2 x="1320" y="-240"/>
     </wire>
     <wire>
-      <p1 x="260" y="400"/>
-      <p2 x="280" y="400"/>
-    </wire>
-    <wire>
-      <p1 x="520" y="400"/>
-      <p2 x="540" y="400"/>
+      <p1 x="-80" y="400"/>
+      <p2 x="260" y="400"/>
     </wire>
     <wire>
       <p1 x="780" y="400"/>
-      <p2 x="800" y="400"/>
+      <p2 x="1040" y="400"/>
     </wire>
     <wire>
-      <p1 x="1040" y="400"/>
-      <p2 x="1060" y="400"/>
+      <p1 x="260" y="400"/>
+      <p2 x="520" y="400"/>
     </wire>
     <wire>
-      <p1 x="340" y="400"/>
-      <p2 x="380" y="400"/>
+      <p1 x="520" y="400"/>
+      <p2 x="780" y="400"/>
     </wire>
     <wire>
-      <p1 x="600" y="400"/>
-      <p2 x="620" y="400"/>
+      <p1 x="40" y="80"/>
+      <p2 x="60" y="80"/>
     </wire>
     <wire>
-      <p1 x="860" y="400"/>
-      <p2 x="880" y="400"/>
+      <p1 x="240" y="80"/>
+      <p2 x="500" y="80"/>
     </wire>
     <wire>
-      <p1 x="1120" y="400"/>
-      <p2 x="1280" y="400"/>
+      <p1 x="760" y="80"/>
+      <p2 x="1020" y="80"/>
     </wire>
     <wire>
-      <p1 x="-60" y="180"/>
-      <p2 x="40" y="180"/>
+      <p1 x="60" y="80"/>
+      <p2 x="80" y="80"/>
     </wire>
     <wire>
-      <p1 x="40" y="180"/>
-      <p2 x="80" y="180"/>
+      <p1 x="500" y="80"/>
+      <p2 x="760" y="80"/>
     </wire>
     <wire>
-      <p1 x="1060" y="20"/>
-      <p2 x="1080" y="20"/>
+      <p1 x="260" y="340"/>
+      <p2 x="280" y="340"/>
     </wire>
     <wire>
-      <p1 x="1120" y="20"/>
-      <p2 x="1140" y="20"/>
+      <p1 x="520" y="340"/>
+      <p2 x="540" y="340"/>
+    </wire>
+    <wire>
+      <p1 x="780" y="340"/>
+      <p2 x="800" y="340"/>
+    </wire>
+    <wire>
+      <p1 x="1040" y="340"/>
+      <p2 x="1060" y="340"/>
+    </wire>
+    <wire>
+      <p1 x="340" y="340"/>
+      <p2 x="380" y="340"/>
+    </wire>
+    <wire>
+      <p1 x="600" y="340"/>
+      <p2 x="620" y="340"/>
+    </wire>
+    <wire>
+      <p1 x="860" y="340"/>
+      <p2 x="880" y="340"/>
+    </wire>
+    <wire>
+      <p1 x="1120" y="340"/>
+      <p2 x="1280" y="340"/>
+    </wire>
+    <wire>
+      <p1 x="1080" y="-120"/>
+      <p2 x="1100" y="-120"/>
+    </wire>
+    <wire>
+      <p1 x="1100" y="-120"/>
+      <p2 x="1120" y="-120"/>
     </wire>
     <wire>
       <p1 x="380" y="-280"/>
@@ -826,8 +891,12 @@ counter; synchronous reset</string>
       <p2 x="1080" y="-280"/>
     </wire>
     <wire>
-      <p1 x="-80" y="120"/>
-      <p2 x="-40" y="120"/>
+      <p1 x="-60" y="120"/>
+      <p2 x="40" y="120"/>
+    </wire>
+    <wire>
+      <p1 x="40" y="120"/>
+      <p2 x="80" y="120"/>
     </wire>
     <wire>
       <p1 x="1180" y="-220"/>
@@ -845,6 +914,10 @@ counter; synchronous reset</string>
       <p1 x="520" y="-220"/>
       <p2 x="760" y="-220"/>
     </wire>
+    <wire>
+      <p1 x="760" y="-220"/>
+      <p2 x="1000" y="-220"/>
+    </wire>
     <wire>
       <p1 x="1000" y="-220"/>
       <p2 x="1140" y="-220"/>
@@ -854,48 +927,12 @@ counter; synchronous reset</string>
       <p2 x="520" y="-220"/>
     </wire>
     <wire>
-      <p1 x="760" y="-220"/>
-      <p2 x="1000" y="-220"/>
-    </wire>
-    <wire>
-      <p1 x="340" y="380"/>
-      <p2 x="360" y="380"/>
-    </wire>
-    <wire>
-      <p1 x="260" y="380"/>
-      <p2 x="280" y="380"/>
-    </wire>
-    <wire>
-      <p1 x="600" y="380"/>
-      <p2 x="640" y="380"/>
-    </wire>
-    <wire>
-      <p1 x="520" y="380"/>
-      <p2 x="540" y="380"/>
-    </wire>
-    <wire>
-      <p1 x="860" y="380"/>
-      <p2 x="900" y="380"/>
-    </wire>
-    <wire>
-      <p1 x="780" y="380"/>
-      <p2 x="800" y="380"/>
-    </wire>
-    <wire>
-      <p1 x="1120" y="380"/>
-      <p2 x="1140" y="380"/>
-    </wire>
-    <wire>
-      <p1 x="1040" y="380"/>
-      <p2 x="1060" y="380"/>
-    </wire>
-    <wire>
-      <p1 x="1140" y="380"/>
+      <p1 x="660" y="380"/>
       <p2 x="1160" y="380"/>
     </wire>
     <wire>
-      <p1 x="1160" y="380"/>
-      <p2 x="1300" y="380"/>
+      <p1 x="-80" y="60"/>
+      <p2 x="-40" y="60"/>
     </wire>
     <wire>
       <p1 x="-80" y="-320"/>
@@ -906,8 +943,8 @@ counter; synchronous reset</string>
       <p2 x="1380" y="-320"/>
     </wire>
     <wire>
-      <p1 x="640" y="380"/>
-      <p2 x="640" y="540"/>
+      <p1 x="640" y="320"/>
+      <p2 x="640" y="420"/>
     </wire>
     <wire>
       <p1 x="1280" y="-280"/>
@@ -915,15 +952,15 @@ counter; synchronous reset</string>
     </wire>
     <wire>
       <p1 x="1280" y="-220"/>
-      <p2 x="1280" y="400"/>
-    </wire>
-    <wire>
-      <p1 x="260" y="400"/>
-      <p2 x="260" y="460"/>
+      <p2 x="1280" y="340"/>
     </wire>
     <wire>
       <p1 x="260" y="340"/>
-      <p2 x="260" y="380"/>
+      <p2 x="260" y="400"/>
+    </wire>
+    <wire>
+      <p1 x="260" y="280"/>
+      <p2 x="260" y="320"/>
     </wire>
     <wire>
       <p1 x="260" y="-220"/>
@@ -931,87 +968,91 @@ counter; synchronous reset</string>
     </wire>
     <wire>
       <p1 x="260" y="-160"/>
-      <p2 x="260" y="-20"/>
+      <p2 x="260" y="-60"/>
     </wire>
     <wire>
-      <p1 x="900" y="380"/>
-      <p2 x="900" y="540"/>
-    </wire>
-    <wire>
-      <p1 x="520" y="400"/>
-      <p2 x="520" y="460"/>
+      <p1 x="900" y="320"/>
+      <p2 x="900" y="420"/>
     </wire>
     <wire>
       <p1 x="520" y="340"/>
-      <p2 x="520" y="380"/>
+      <p2 x="520" y="400"/>
+    </wire>
+    <wire>
+      <p1 x="520" y="280"/>
+      <p2 x="520" y="320"/>
     </wire>
     <wire>
       <p1 x="520" y="-120"/>
-      <p2 x="520" y="-20"/>
+      <p2 x="520" y="-60"/>
     </wire>
     <wire>
       <p1 x="520" y="-220"/>
       <p2 x="520" y="-200"/>
     </wire>
     <wire>
-      <p1 x="1160" y="380"/>
-      <p2 x="1160" y="540"/>
+      <p1 x="1160" y="320"/>
+      <p2 x="1160" y="380"/>
     </wire>
     <wire>
       <p1 x="1160" y="-120"/>
-      <p2 x="1160" y="-80"/>
+      <p2 x="1160" y="-100"/>
     </wire>
     <wire>
-      <p1 x="780" y="400"/>
-      <p2 x="780" y="460"/>
+      <p1 x="1160" y="380"/>
+      <p2 x="1160" y="420"/>
     </wire>
     <wire>
       <p1 x="780" y="340"/>
-      <p2 x="780" y="380"/>
+      <p2 x="780" y="400"/>
+    </wire>
+    <wire>
+      <p1 x="780" y="280"/>
+      <p2 x="780" y="320"/>
     </wire>
     <wire>
       <p1 x="780" y="-120"/>
-      <p2 x="780" y="-20"/>
+      <p2 x="780" y="-60"/>
     </wire>
     <wire>
       <p1 x="780" y="-260"/>
       <p2 x="780" y="-200"/>
     </wire>
     <wire>
-      <p1 x="1040" y="400"/>
-      <p2 x="1040" y="460"/>
+      <p1 x="1040" y="340"/>
+      <p2 x="1040" y="400"/>
     </wire>
     <wire>
-      <p1 x="1040" y="340"/>
-      <p2 x="1040" y="380"/>
+      <p1 x="1040" y="280"/>
+      <p2 x="1040" y="320"/>
     </wire>
     <wire>
       <p1 x="1040" y="-120"/>
-      <p2 x="1040" y="-80"/>
+      <p2 x="1040" y="-100"/>
     </wire>
     <wire>
       <p1 x="660" y="-240"/>
-      <p2 x="660" y="480"/>
+      <p2 x="660" y="380"/>
     </wire>
     <wire>
-      <p1 x="1300" y="380"/>
-      <p2 x="1300" y="400"/>
+      <p1 x="1300" y="320"/>
+      <p2 x="1300" y="340"/>
     </wire>
     <wire>
-      <p1 x="280" y="260"/>
-      <p2 x="280" y="280"/>
+      <p1 x="280" y="200"/>
+      <p2 x="280" y="220"/>
     </wire>
     <wire>
-      <p1 x="280" y="60"/>
-      <p2 x="280" y="180"/>
+      <p1 x="280" y="20"/>
+      <p2 x="280" y="120"/>
     </wire>
     <wire>
-      <p1 x="540" y="260"/>
-      <p2 x="540" y="280"/>
+      <p1 x="540" y="200"/>
+      <p2 x="540" y="220"/>
     </wire>
     <wire>
-      <p1 x="540" y="60"/>
-      <p2 x="540" y="180"/>
+      <p1 x="540" y="20"/>
+      <p2 x="540" y="120"/>
     </wire>
     <wire>
       <p1 x="540" y="-240"/>
@@ -1022,28 +1063,28 @@ counter; synchronous reset</string>
       <p2 x="1180" y="-200"/>
     </wire>
     <wire>
-      <p1 x="800" y="260"/>
-      <p2 x="800" y="280"/>
+      <p1 x="800" y="200"/>
+      <p2 x="800" y="220"/>
     </wire>
     <wire>
-      <p1 x="800" y="60"/>
-      <p2 x="800" y="180"/>
+      <p1 x="800" y="20"/>
+      <p2 x="800" y="120"/>
     </wire>
     <wire>
       <p1 x="800" y="-280"/>
       <p2 x="800" y="-200"/>
     </wire>
     <wire>
-      <p1 x="1060" y="260"/>
-      <p2 x="1060" y="280"/>
+      <p1 x="1060" y="200"/>
+      <p2 x="1060" y="220"/>
     </wire>
     <wire>
-      <p1 x="1060" y="160"/>
-      <p2 x="1060" y="180"/>
+      <p1 x="1060" y="100"/>
+      <p2 x="1060" y="120"/>
     </wire>
     <wire>
-      <p1 x="1060" y="-20"/>
-      <p2 x="1060" y="20"/>
+      <p1 x="1060" y="-40"/>
+      <p2 x="1060" y="0"/>
     </wire>
     <wire>
       <p1 x="1060" y="-260"/>
@@ -1051,167 +1092,151 @@ counter; synchronous reset</string>
     </wire>
     <wire>
       <p1 x="1320" y="-240"/>
-      <p2 x="1320" y="400"/>
+      <p2 x="1320" y="340"/>
     </wire>
     <wire>
-      <p1 x="40" y="180"/>
-      <p2 x="40" y="200"/>
+      <p1 x="40" y="120"/>
+      <p2 x="40" y="140"/>
     </wire>
     <wire>
-      <p1 x="300" y="240"/>
-      <p2 x="300" y="260"/>
+      <p1 x="300" y="180"/>
+      <p2 x="300" y="200"/>
     </wire>
     <wire>
-      <p1 x="300" y="-40"/>
-      <p2 x="300" y="-20"/>
+      <p1 x="300" y="-80"/>
+      <p2 x="300" y="-60"/>
     </wire>
     <wire>
-      <p1 x="560" y="240"/>
-      <p2 x="560" y="260"/>
+      <p1 x="560" y="180"/>
+      <p2 x="560" y="200"/>
     </wire>
     <wire>
-      <p1 x="560" y="-40"/>
-      <p2 x="560" y="-20"/>
+      <p1 x="560" y="-80"/>
+      <p2 x="560" y="-60"/>
     </wire>
     <wire>
       <p1 x="1200" y="-220"/>
       <p2 x="1200" y="-100"/>
     </wire>
     <wire>
-      <p1 x="820" y="240"/>
-      <p2 x="820" y="260"/>
+      <p1 x="820" y="180"/>
+      <p2 x="820" y="200"/>
     </wire>
     <wire>
-      <p1 x="820" y="-40"/>
-      <p2 x="820" y="-20"/>
+      <p1 x="820" y="-80"/>
+      <p2 x="820" y="-60"/>
     </wire>
     <wire>
-      <p1 x="1080" y="20"/>
-      <p2 x="1080" y="40"/>
+      <p1 x="1080" y="0"/>
+      <p2 x="1080" y="20"/>
     </wire>
     <wire>
-      <p1 x="1080" y="240"/>
-      <p2 x="1080" y="260"/>
+      <p1 x="1080" y="180"/>
+      <p2 x="1080" y="200"/>
     </wire>
     <wire>
-      <p1 x="1080" y="-100"/>
-      <p2 x="1080" y="-80"/>
+      <p1 x="1080" y="-120"/>
+      <p2 x="1080" y="-100"/>
     </wire>
     <wire>
       <p1 x="1080" y="-280"/>
       <p2 x="1080" y="-200"/>
     </wire>
     <wire>
-      <p1 x="-60" y="160"/>
-      <p2 x="-60" y="180"/>
+      <p1 x="-60" y="100"/>
+      <p2 x="-60" y="120"/>
     </wire>
     <wire>
       <p1 x="-60" y="-320"/>
       <p2 x="-60" y="-240"/>
     </wire>
     <wire>
-      <p1 x="1340" y="460"/>
-      <p2 x="1340" y="540"/>
+      <p1 x="1340" y="400"/>
+      <p2 x="1340" y="420"/>
     </wire>
     <wire>
       <p1 x="1340" y="-260"/>
-      <p2 x="1340" y="400"/>
+      <p2 x="1340" y="340"/>
     </wire>
     <wire>
-      <p1 x="60" y="100"/>
-      <p2 x="60" y="140"/>
+      <p1 x="60" y="40"/>
+      <p2 x="60" y="80"/>
     </wire>
     <wire>
-      <p1 x="320" y="160"/>
-      <p2 x="320" y="180"/>
+      <p1 x="320" y="100"/>
+      <p2 x="320" y="120"/>
     </wire>
     <wire>
-      <p1 x="580" y="160"/>
-      <p2 x="580" y="180"/>
+      <p1 x="580" y="100"/>
+      <p2 x="580" y="120"/>
     </wire>
     <wire>
       <p1 x="1220" y="-300"/>
       <p2 x="1220" y="-200"/>
     </wire>
     <wire>
-      <p1 x="840" y="160"/>
-      <p2 x="840" y="180"/>
+      <p1 x="840" y="100"/>
+      <p2 x="840" y="120"/>
     </wire>
     <wire>
-      <p1 x="200" y="-400"/>
-      <p2 x="200" y="-380"/>
+      <p1 x="200" y="-360"/>
+      <p2 x="200" y="120"/>
     </wire>
     <wire>
-      <p1 x="200" y="-340"/>
-      <p2 x="200" y="180"/>
+      <p1 x="460" y="-360"/>
+      <p2 x="460" y="120"/>
     </wire>
     <wire>
-      <p1 x="460" y="-400"/>
-      <p2 x="460" y="-380"/>
-    </wire>
-    <wire>
-      <p1 x="460" y="-340"/>
-      <p2 x="460" y="180"/>
-    </wire>
-    <wire>
-      <p1 x="1100" y="100"/>
-      <p2 x="1100" y="180"/>
+      <p1 x="1100" y="80"/>
+      <p2 x="1100" y="120"/>
     </wire>
     <wire>
       <p1 x="1100" y="-280"/>
-      <p2 x="1100" y="-100"/>
+      <p2 x="1100" y="-120"/>
     </wire>
     <wire>
-      <p1 x="720" y="-400"/>
-      <p2 x="720" y="-380"/>
-    </wire>
-    <wire>
-      <p1 x="720" y="-340"/>
-      <p2 x="720" y="180"/>
+      <p1 x="720" y="-360"/>
+      <p2 x="720" y="120"/>
     </wire>
     <wire>
       <p1 x="1360" y="-300"/>
-      <p2 x="1360" y="400"/>
+      <p2 x="1360" y="340"/>
     </wire>
     <wire>
-      <p1 x="980" y="-400"/>
-      <p2 x="980" y="-380"/>
-    </wire>
-    <wire>
-      <p1 x="980" y="-340"/>
-      <p2 x="980" y="180"/>
+      <p1 x="980" y="-360"/>
+      <p2 x="980" y="120"/>
     </wire>
     <wire>
       <p1 x="1240" y="-120"/>
       <p2 x="1240" y="-100"/>
     </wire>
     <wire>
-      <p1 x="220" y="240"/>
-      <p2 x="220" y="260"/>
+      <p1 x="220" y="180"/>
+      <p2 x="220" y="200"/>
     </wire>
     <wire>
-      <p1 x="480" y="240"/>
-      <p2 x="480" y="260"/>
+      <p1 x="480" y="180"/>
+      <p2 x="480" y="200"/>
     </wire>
     <wire>
-      <p1 x="1120" y="20"/>
-      <p2 x="1120" y="40"/>
+      <p1 x="1120" y="0"/>
+      <p2 x="1120" y="20"/>
     </wire>
     <wire>
-      <p1 x="1120" y="-100"/>
-      <p2 x="1120" y="-80"/>
+      <p1 x="1120" y="-120"/>
+      <p2 x="1120" y="-100"/>
     </wire>
     <wire>
       <p1 x="1380" y="-320"/>
-      <p2 x="1380" y="400"/>
+      <p2 x="1380" y="340"/>
     </wire>
     <wire>
-      <p1 x="740" y="240"/>
-      <p2 x="740" y="260"/>
+      <p1 x="740" y="180"/>
+      <p2 x="740" y="200"/>
     </wire>
     <wire>
-      <p1 x="1000" y="240"/>
-      <p2 x="1000" y="260"/>
+      <p1 x="1000" y="180"/>
+      <p2 x="1000" y="200"/>
     </wire>
     <wire>
       <p1 x="1000" y="-220"/>
@@ -1219,75 +1244,71 @@ counter; synchronous reset</string>
     </wire>
     <wire>
       <p1 x="360" y="-300"/>
-      <p2 x="360" y="380"/>
+      <p2 x="360" y="320"/>
     </wire>
     <wire>
-      <p1 x="360" y="380"/>
-      <p2 x="360" y="540"/>
+      <p1 x="360" y="320"/>
+      <p2 x="360" y="420"/>
     </wire>
     <wire>
       <p1 x="620" y="-260"/>
-      <p2 x="620" y="-40"/>
+      <p2 x="620" y="-80"/>
     </wire>
     <wire>
-      <p1 x="620" y="-40"/>
-      <p2 x="620" y="400"/>
+      <p1 x="620" y="-80"/>
+      <p2 x="620" y="340"/>
     </wire>
     <wire>
       <p1 x="1260" y="-220"/>
       <p2 x="1260" y="-200"/>
     </wire>
     <wire>
-      <p1 x="240" y="260"/>
-      <p2 x="240" y="280"/>
+      <p1 x="240" y="200"/>
+      <p2 x="240" y="220"/>
     </wire>
     <wire>
-      <p1 x="240" y="100"/>
-      <p2 x="240" y="140"/>
+      <p1 x="240" y="40"/>
+      <p2 x="240" y="80"/>
     </wire>
     <wire>
-      <p1 x="240" y="140"/>
-      <p2 x="240" y="180"/>
+      <p1 x="240" y="80"/>
+      <p2 x="240" y="120"/>
     </wire>
     <wire>
       <p1 x="880" y="-240"/>
-      <p2 x="880" y="-40"/>
+      <p2 x="880" y="-80"/>
     </wire>
     <wire>
-      <p1 x="880" y="-40"/>
-      <p2 x="880" y="400"/>
+      <p1 x="880" y="-80"/>
+      <p2 x="880" y="340"/>
     </wire>
     <wire>
-      <p1 x="500" y="260"/>
-      <p2 x="500" y="280"/>
+      <p1 x="500" y="200"/>
+      <p2 x="500" y="220"/>
     </wire>
     <wire>
-      <p1 x="500" y="140"/>
-      <p2 x="500" y="180"/>
+      <p1 x="500" y="80"/>
+      <p2 x="500" y="120"/>
     </wire>
     <wire>
       <p1 x="500" y="-280"/>
       <p2 x="500" y="-200"/>
     </wire>
     <wire>
-      <p1 x="1140" y="380"/>
-      <p2 x="1140" y="480"/>
-    </wire>
-    <wire>
-      <p1 x="1140" y="0"/>
-      <p2 x="1140" y="20"/>
+      <p1 x="1140" y="-20"/>
+      <p2 x="1140" y="0"/>
     </wire>
     <wire>
       <p1 x="1140" y="-220"/>
       <p2 x="1140" y="-200"/>
     </wire>
     <wire>
-      <p1 x="760" y="260"/>
-      <p2 x="760" y="280"/>
+      <p1 x="760" y="200"/>
+      <p2 x="760" y="220"/>
     </wire>
     <wire>
-      <p1 x="760" y="140"/>
-      <p2 x="760" y="180"/>
+      <p1 x="760" y="80"/>
+      <p2 x="760" y="120"/>
     </wire>
     <wire>
       <p1 x="760" y="-220"/>
@@ -1298,20 +1319,20 @@ counter; synchronous reset</string>
       <p2 x="1020" y="-200"/>
     </wire>
     <wire>
-      <p1 x="1020" y="140"/>
-      <p2 x="1020" y="180"/>
+      <p1 x="1020" y="80"/>
+      <p2 x="1020" y="120"/>
     </wire>
     <wire>
-      <p1 x="1020" y="260"/>
-      <p2 x="1020" y="280"/>
+      <p1 x="1020" y="200"/>
+      <p2 x="1020" y="220"/>
     </wire>
     <wire>
       <p1 x="380" y="-280"/>
-      <p2 x="380" y="-40"/>
+      <p2 x="380" y="-80"/>
     </wire>
     <wire>
-      <p1 x="380" y="-40"/>
-      <p2 x="380" y="400"/>
+      <p1 x="380" y="-80"/>
+      <p2 x="380" y="340"/>
     </wire>
   </wires>
 </circuit>
\ No newline at end of file
diff --git a/src/main/dig/74xx/lib/7447.dig b/src/main/dig/74xx/lib/7447.dig
index 501a38afa..3e943de81 100644
--- a/src/main/dig/74xx/lib/7447.dig
+++ b/src/main/dig/74xx/lib/7447.dig
@@ -15,6 +15,10 @@
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>Bit 0</string>
+        </entry>
         <entry>
           <string>Label</string>
           <string>A</string>
@@ -24,11 +28,15 @@
           <int>7</int>
         </entry>
       </elementAttributes>
-      <pos x="-540" y="-960"/>
+      <pos x="-180" y="-840"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>Bit 1</string>
+        </entry>
         <entry>
           <string>Label</string>
           <string>B</string>
@@ -38,11 +46,15 @@
           <int>1</int>
         </entry>
       </elementAttributes>
-      <pos x="-540" y="-1040"/>
+      <pos x="-180" y="-920"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>Bit 2</string>
+        </entry>
         <entry>
           <string>Label</string>
           <string>C</string>
@@ -52,11 +64,15 @@
           <int>2</int>
         </entry>
       </elementAttributes>
-      <pos x="-540" y="-1120"/>
+      <pos x="-180" y="-1000"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>Bit 3</string>
+        </entry>
         <entry>
           <string>Label</string>
           <string>D</string>
@@ -66,112 +82,20 @@
           <int>6</int>
         </entry>
       </elementAttributes>
-      <pos x="-540" y="-1200"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="1"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>a</string>
-        </entry>
-      </elementAttributes>
-      <pos x="440" y="-1200"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="1"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>b</string>
-        </entry>
-      </elementAttributes>
-      <pos x="400" y="-1200"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="1"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>c</string>
-        </entry>
-      </elementAttributes>
-      <pos x="360" y="-1200"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="1"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>d</string>
-        </entry>
-      </elementAttributes>
-      <pos x="320" y="-1200"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>NetName</string>
-          <string>a</string>
-        </entry>
-      </elementAttributes>
-      <pos x="-120" y="-940"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>NetName</string>
-          <string>b</string>
-        </entry>
-      </elementAttributes>
-      <pos x="-120" y="-1020"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>NetName</string>
-          <string>c</string>
-        </entry>
-      </elementAttributes>
-      <pos x="-120" y="-1100"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>NetName</string>
-          <string>d</string>
-        </entry>
-      </elementAttributes>
-      <pos x="-120" y="-1180"/>
+      <pos x="-180" y="-1080"/>
     </visualElement>
     <visualElement>
       <elementName>NAnd</elementName>
       <elementAttributes/>
-      <pos x="-260" y="-680"/>
+      <pos x="40" y="-680"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
       <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>ripple blanking output (LOW active)</string>
+        </entry>
         <entry>
           <string>Label</string>
           <string>~RBO</string>
@@ -181,11 +105,15 @@
           <int>4</int>
         </entry>
       </elementAttributes>
-      <pos x="-160" y="-660"/>
+      <pos x="140" y="-660"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>ripple blanking input (LOW active)</string>
+        </entry>
         <entry>
           <string>Label</string>
           <string>~RBI</string>
@@ -195,32 +123,32 @@
           <int>5</int>
         </entry>
       </elementAttributes>
-      <pos x="-540" y="-640"/>
+      <pos x="-180" y="-640"/>
     </visualElement>
     <visualElement>
       <elementName>Not</elementName>
       <elementAttributes/>
-      <pos x="-420" y="-640"/>
+      <pos x="-80" y="-640"/>
     </visualElement>
     <visualElement>
       <elementName>Or</elementName>
       <elementAttributes/>
-      <pos x="-200" y="-1200"/>
+      <pos x="140" y="-1080"/>
     </visualElement>
     <visualElement>
       <elementName>Or</elementName>
       <elementAttributes/>
-      <pos x="-200" y="-1120"/>
+      <pos x="140" y="-1000"/>
     </visualElement>
     <visualElement>
       <elementName>Or</elementName>
       <elementAttributes/>
-      <pos x="-200" y="-1040"/>
+      <pos x="140" y="-920"/>
     </visualElement>
     <visualElement>
       <elementName>Or</elementName>
       <elementAttributes/>
-      <pos x="-200" y="-960"/>
+      <pos x="140" y="-840"/>
     </visualElement>
     <visualElement>
       <elementName>NOr</elementName>
@@ -230,12 +158,12 @@
           <int>4</int>
         </entry>
       </elementAttributes>
-      <pos x="-440" y="-800"/>
+      <pos x="-80" y="-800"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
       <elementAttributes/>
-      <pos x="-300" y="-920"/>
+      <pos x="40" y="-760"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -631,6 +559,10 @@
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>lamp test</string>
+        </entry>
         <entry>
           <string>rotation</string>
           <rotation rotation="3"/>
@@ -659,12 +591,12 @@
   </visualElements>
   <wires>
     <wire>
-      <p1 x="400" y="-900"/>
-      <p2 x="500" y="-900"/>
+      <p1 x="200" y="-900"/>
+      <p2 x="400" y="-900"/>
     </wire>
     <wire>
-      <p1 x="-240" y="-900"/>
-      <p2 x="-220" y="-900"/>
+      <p1 x="400" y="-900"/>
+      <p2 x="500" y="-900"/>
     </wire>
     <wire>
       <p1 x="440" y="-260"/>
@@ -678,21 +610,17 @@
       <p1 x="560" y="-520"/>
       <p2 x="600" y="-520"/>
     </wire>
-    <wire>
-      <p1 x="-220" y="-1160"/>
-      <p2 x="-200" y="-1160"/>
-    </wire>
     <wire>
       <p1 x="560" y="520"/>
       <p2 x="600" y="520"/>
     </wire>
     <wire>
-      <p1 x="340" y="-780"/>
-      <p2 x="500" y="-780"/>
+      <p1 x="-120" y="-780"/>
+      <p2 x="-80" y="-780"/>
     </wire>
     <wire>
-      <p1 x="-480" y="-780"/>
-      <p2 x="-440" y="-780"/>
+      <p1 x="340" y="-780"/>
+      <p2 x="500" y="-780"/>
     </wire>
     <wire>
       <p1 x="380" y="-140"/>
@@ -711,12 +639,8 @@
       <p2 x="500" y="780"/>
     </wire>
     <wire>
-      <p1 x="-540" y="-1040"/>
-      <p2 x="-480" y="-1040"/>
-    </wire>
-    <wire>
-      <p1 x="-480" y="-1040"/>
-      <p2 x="-200" y="-1040"/>
+      <p1 x="120" y="-1040"/>
+      <p2 x="140" y="-1040"/>
     </wire>
     <wire>
       <p1 x="700" y="400"/>
@@ -726,6 +650,10 @@
       <p1 x="620" y="400"/>
       <p2 x="640" y="400"/>
     </wire>
+    <wire>
+      <p1 x="120" y="-660"/>
+      <p2 x="140" y="-660"/>
+    </wire>
     <wire>
       <p1 x="440" y="-660"/>
       <p2 x="500" y="-660"/>
@@ -734,10 +662,6 @@
       <p1 x="580" y="-660"/>
       <p2 x="640" y="-660"/>
     </wire>
-    <wire>
-      <p1 x="-180" y="-660"/>
-      <p2 x="-160" y="-660"/>
-    </wire>
     <wire>
       <p1 x="440" y="-20"/>
       <p2 x="500" y="-20"/>
@@ -750,6 +674,10 @@
       <p1 x="380" y="660"/>
       <p2 x="500" y="660"/>
     </wire>
+    <wire>
+      <p1 x="-180" y="-920"/>
+      <p2 x="-120" y="-920"/>
+    </wire>
     <wire>
       <p1 x="380" y="-920"/>
       <p2 x="500" y="-920"/>
@@ -763,12 +691,8 @@
       <p2 x="640" y="-920"/>
     </wire>
     <wire>
-      <p1 x="-340" y="-920"/>
-      <p2 x="-300" y="-920"/>
-    </wire>
-    <wire>
-      <p1 x="-220" y="-920"/>
-      <p2 x="-200" y="-920"/>
+      <p1 x="-120" y="-920"/>
+      <p2 x="140" y="-920"/>
     </wire>
     <wire>
       <p1 x="560" y="-280"/>
@@ -794,10 +718,6 @@
       <p1 x="440" y="-1180"/>
       <p2 x="460" y="-1180"/>
     </wire>
-    <wire>
-      <p1 x="-140" y="-1180"/>
-      <p2 x="-120" y="-1180"/>
-    </wire>
     <wire>
       <p1 x="420" y="-540"/>
       <p2 x="500" y="-540"/>
@@ -807,8 +727,12 @@
       <p2 x="500" y="540"/>
     </wire>
     <wire>
-      <p1 x="-460" y="-800"/>
-      <p2 x="-440" y="-800"/>
+      <p1 x="120" y="-800"/>
+      <p2 x="140" y="-800"/>
+    </wire>
+    <wire>
+      <p1 x="-100" y="-800"/>
+      <p2 x="-80" y="-800"/>
     </wire>
     <wire>
       <p1 x="700" y="160"/>
@@ -818,6 +742,10 @@
       <p1 x="620" y="160"/>
       <p2 x="640" y="160"/>
     </wire>
+    <wire>
+      <p1 x="200" y="-1060"/>
+      <p2 x="320" y="-1060"/>
+    </wire>
     <wire>
       <p1 x="440" y="-1060"/>
       <p2 x="500" y="-1060"/>
@@ -834,6 +762,10 @@
       <p1 x="580" y="420"/>
       <p2 x="640" y="420"/>
     </wire>
+    <wire>
+      <p1 x="20" y="-680"/>
+      <p2 x="40" y="-680"/>
+    </wire>
     <wire>
       <p1 x="600" y="-680"/>
       <p2 x="640" y="-680"/>
@@ -846,10 +778,6 @@
       <p1 x="560" y="-680"/>
       <p2 x="580" y="-680"/>
     </wire>
-    <wire>
-      <p1 x="-340" y="-680"/>
-      <p2 x="-260" y="-680"/>
-    </wire>
     <wire>
       <p1 x="420" y="-40"/>
       <p2 x="500" y="-40"/>
@@ -882,10 +810,6 @@
       <p1 x="580" y="-940"/>
       <p2 x="640" y="-940"/>
     </wire>
-    <wire>
-      <p1 x="-140" y="-940"/>
-      <p2 x="-120" y="-940"/>
-    </wire>
     <wire>
       <p1 x="380" y="-300"/>
       <p2 x="500" y="-300"/>
@@ -899,12 +823,8 @@
       <p2 x="500" y="300"/>
     </wire>
     <wire>
-      <p1 x="-540" y="-1200"/>
-      <p2 x="-520" y="-1200"/>
-    </wire>
-    <wire>
-      <p1 x="-520" y="-1200"/>
-      <p2 x="-200" y="-1200"/>
+      <p1 x="200" y="-820"/>
+      <p2 x="440" y="-820"/>
     </wire>
     <wire>
       <p1 x="460" y="-820"/>
@@ -926,6 +846,10 @@
       <p1 x="400" y="820"/>
       <p2 x="500" y="820"/>
     </wire>
+    <wire>
+      <p1 x="-180" y="-1080"/>
+      <p2 x="-160" y="-1080"/>
+    </wire>
     <wire>
       <p1 x="420" y="-1080"/>
       <p2 x="500" y="-1080"/>
@@ -935,8 +859,8 @@
       <p2 x="600" y="-1080"/>
     </wire>
     <wire>
-      <p1 x="-220" y="-1080"/>
-      <p2 x="-200" y="-1080"/>
+      <p1 x="-160" y="-1080"/>
+      <p2 x="140" y="-1080"/>
     </wire>
     <wire>
       <p1 x="560" y="-440"/>
@@ -974,22 +898,18 @@
       <p1 x="580" y="700"/>
       <p2 x="640" y="700"/>
     </wire>
+    <wire>
+      <p1 x="120" y="-960"/>
+      <p2 x="140" y="-960"/>
+    </wire>
     <wire>
       <p1 x="700" y="-960"/>
       <p2 x="720" y="-960"/>
     </wire>
-    <wire>
-      <p1 x="-540" y="-960"/>
-      <p2 x="-460" y="-960"/>
-    </wire>
     <wire>
       <p1 x="620" y="-960"/>
       <p2 x="640" y="-960"/>
     </wire>
-    <wire>
-      <p1 x="-460" y="-960"/>
-      <p2 x="-200" y="-960"/>
-    </wire>
     <wire>
       <p1 x="620" y="-320"/>
       <p2 x="640" y="-320"/>
@@ -1002,6 +922,10 @@
       <p1 x="320" y="580"/>
       <p2 x="500" y="580"/>
     </wire>
+    <wire>
+      <p1 x="-180" y="-840"/>
+      <p2 x="-100" y="-840"/>
+    </wire>
     <wire>
       <p1 x="420" y="-840"/>
       <p2 x="500" y="-840"/>
@@ -1010,6 +934,10 @@
       <p1 x="560" y="-840"/>
       <p2 x="600" y="-840"/>
     </wire>
+    <wire>
+      <p1 x="-100" y="-840"/>
+      <p2 x="140" y="-840"/>
+    </wire>
     <wire>
       <p1 x="560" y="-200"/>
       <p2 x="600" y="-200"/>
@@ -1026,10 +954,6 @@
       <p1 x="320" y="-1100"/>
       <p2 x="500" y="-1100"/>
     </wire>
-    <wire>
-      <p1 x="-140" y="-1100"/>
-      <p2 x="-120" y="-1100"/>
-    </wire>
     <wire>
       <p1 x="340" y="-460"/>
       <p2 x="500" y="-460"/>
@@ -1038,6 +962,14 @@
       <p1 x="460" y="460"/>
       <p2 x="500" y="460"/>
     </wire>
+    <wire>
+      <p1 x="-160" y="-720"/>
+      <p2 x="-80" y="-720"/>
+    </wire>
+    <wire>
+      <p1 x="0" y="-720"/>
+      <p2 x="40" y="-720"/>
+    </wire>
     <wire>
       <p1 x="700" y="-80"/>
       <p2 x="720" y="-80"/>
@@ -1046,10 +978,6 @@
       <p1 x="620" y="-80"/>
       <p2 x="640" y="-80"/>
     </wire>
-    <wire>
-      <p1 x="-520" y="-720"/>
-      <p2 x="-440" y="-720"/>
-    </wire>
     <wire>
       <p1 x="700" y="720"/>
       <p2 x="720" y="720"/>
@@ -1058,6 +986,10 @@
       <p1 x="620" y="720"/>
       <p2 x="640" y="720"/>
     </wire>
+    <wire>
+      <p1 x="200" y="-980"/>
+      <p2 x="360" y="-980"/>
+    </wire>
     <wire>
       <p1 x="440" y="-980"/>
       <p2 x="500" y="-980"/>
@@ -1107,16 +1039,12 @@
       <p2 x="500" y="860"/>
     </wire>
     <wire>
-      <p1 x="-540" y="-1120"/>
-      <p2 x="-500" y="-1120"/>
+      <p1 x="100" y="-740"/>
+      <p2 x="120" y="-740"/>
     </wire>
     <wire>
-      <p1 x="-500" y="-1120"/>
-      <p2 x="-200" y="-1120"/>
-    </wire>
-    <wire>
-      <p1 x="-500" y="-740"/>
-      <p2 x="-440" y="-740"/>
+      <p1 x="-140" y="-740"/>
+      <p2 x="-80" y="-740"/>
     </wire>
     <wire>
       <p1 x="380" y="-740"/>
@@ -1143,8 +1071,8 @@
       <p2 x="640" y="740"/>
     </wire>
     <wire>
-      <p1 x="-220" y="-1000"/>
-      <p2 x="-200" y="-1000"/>
+      <p1 x="-180" y="-1000"/>
+      <p2 x="-140" y="-1000"/>
     </wire>
     <wire>
       <p1 x="600" y="-1000"/>
@@ -1158,6 +1086,10 @@
       <p1 x="560" y="-1000"/>
       <p2 x="580" y="-1000"/>
     </wire>
+    <wire>
+      <p1 x="-140" y="-1000"/>
+      <p2 x="140" y="-1000"/>
+    </wire>
     <wire>
       <p1 x="560" y="-360"/>
       <p2 x="640" y="-360"/>
@@ -1183,8 +1115,8 @@
       <p2 x="500" y="620"/>
     </wire>
     <wire>
-      <p1 x="-320" y="-880"/>
-      <p2 x="-300" y="-880"/>
+      <p1 x="120" y="-880"/>
+      <p2 x="140" y="-880"/>
     </wire>
     <wire>
       <p1 x="460" y="-500"/>
@@ -1195,13 +1127,17 @@
       <p2 x="500" y="500"/>
     </wire>
     <wire>
-      <p1 x="-360" y="-760"/>
-      <p2 x="-340" y="-760"/>
+      <p1 x="0" y="-760"/>
+      <p2 x="20" y="-760"/>
     </wire>
     <wire>
       <p1 x="560" y="-760"/>
       <p2 x="600" y="-760"/>
     </wire>
+    <wire>
+      <p1 x="20" y="-760"/>
+      <p2 x="40" y="-760"/>
+    </wire>
     <wire>
       <p1 x="600" y="-120"/>
       <p2 x="640" y="-120"/>
@@ -1222,10 +1158,6 @@
       <p1 x="600" y="760"/>
       <p2 x="640" y="760"/>
     </wire>
-    <wire>
-      <p1 x="-140" y="-1020"/>
-      <p2 x="-120" y="-1020"/>
-    </wire>
     <wire>
       <p1 x="340" y="-1020"/>
       <p2 x="500" y="-1020"/>
@@ -1247,12 +1179,12 @@
       <p2 x="640" y="380"/>
     </wire>
     <wire>
-      <p1 x="-380" y="-640"/>
-      <p2 x="-320" y="-640"/>
+      <p1 x="-40" y="-640"/>
+      <p2 x="0" y="-640"/>
     </wire>
     <wire>
-      <p1 x="-540" y="-640"/>
-      <p2 x="-420" y="-640"/>
+      <p1 x="-180" y="-640"/>
+      <p2 x="-80" y="-640"/>
     </wire>
     <wire>
       <p1 x="700" y="-640"/>
@@ -1263,12 +1195,8 @@
       <p2 x="640" y="-640"/>
     </wire>
     <wire>
-      <p1 x="-320" y="-640"/>
-      <p2 x="-260" y="-640"/>
-    </wire>
-    <wire>
-      <p1 x="320" y="-1200"/>
-      <p2 x="320" y="-1180"/>
+      <p1 x="0" y="-640"/>
+      <p2 x="40" y="-640"/>
     </wire>
     <wire>
       <p1 x="320" y="-1180"/>
@@ -1276,6 +1204,10 @@
     </wire>
     <wire>
       <p1 x="320" y="-1100"/>
+      <p2 x="320" y="-1060"/>
+    </wire>
+    <wire>
+      <p1 x="320" y="-1060"/>
       <p2 x="320" y="260"/>
     </wire>
     <wire>
@@ -1286,6 +1218,14 @@
       <p1 x="320" y="260"/>
       <p2 x="320" y="580"/>
     </wire>
+    <wire>
+      <p1 x="0" y="-720"/>
+      <p2 x="0" y="-640"/>
+    </wire>
+    <wire>
+      <p1 x="-100" y="-840"/>
+      <p2 x="-100" y="-800"/>
+    </wire>
     <wire>
       <p1 x="580" y="-1000"/>
       <p2 x="580" y="-980"/>
@@ -1395,12 +1335,8 @@
       <p2 x="420" y="880"/>
     </wire>
     <wire>
-      <p1 x="-520" y="-1200"/>
-      <p2 x="-520" y="-720"/>
-    </wire>
-    <wire>
-      <p1 x="360" y="-1200"/>
-      <p2 x="360" y="-1180"/>
+      <p1 x="360" y="-1180"/>
+      <p2 x="360" y="-1000"/>
     </wire>
     <wire>
       <p1 x="360" y="740"/>
@@ -1410,10 +1346,6 @@
       <p1 x="360" y="340"/>
       <p2 x="360" y="420"/>
     </wire>
-    <wire>
-      <p1 x="360" y="-1180"/>
-      <p2 x="360" y="-1000"/>
-    </wire>
     <wire>
       <p1 x="360" y="420"/>
       <p2 x="360" y="740"/>
@@ -1424,6 +1356,10 @@
     </wire>
     <wire>
       <p1 x="360" y="-1000"/>
+      <p2 x="360" y="-980"/>
+    </wire>
+    <wire>
+      <p1 x="360" y="-980"/>
       <p2 x="360" y="-420"/>
     </wire>
     <wire>
@@ -1431,8 +1367,8 @@
       <p2 x="360" y="-60"/>
     </wire>
     <wire>
-      <p1 x="-460" y="-960"/>
-      <p2 x="-460" y="-800"/>
+      <p1 x="-140" y="-1000"/>
+      <p2 x="-140" y="-740"/>
     </wire>
     <wire>
       <p1 x="620" y="-1140"/>
@@ -1511,8 +1447,8 @@
       <p2 x="460" y="140"/>
     </wire>
     <wire>
-      <p1 x="400" y="-1200"/>
-      <p2 x="400" y="-1180"/>
+      <p1 x="400" y="-1180"/>
+      <p2 x="400" y="-900"/>
     </wire>
     <wire>
       <p1 x="400" y="-100"/>
@@ -1542,22 +1478,6 @@
       <p1 x="400" y="-680"/>
       <p2 x="400" y="-100"/>
     </wire>
-    <wire>
-      <p1 x="400" y="-1180"/>
-      <p2 x="400" y="-900"/>
-    </wire>
-    <wire>
-      <p1 x="-500" y="-1120"/>
-      <p2 x="-500" y="-740"/>
-    </wire>
-    <wire>
-      <p1 x="-340" y="-920"/>
-      <p2 x="-340" y="-760"/>
-    </wire>
-    <wire>
-      <p1 x="-340" y="-760"/>
-      <p2 x="-340" y="-680"/>
-    </wire>
     <wire>
       <p1 x="340" y="-1180"/>
       <p2 x="340" y="-1160"/>
@@ -1587,17 +1507,41 @@
       <p2 x="340" y="-780"/>
     </wire>
     <wire>
-      <p1 x="440" y="-1200"/>
-      <p2 x="440" y="-1180"/>
+      <p1 x="20" y="-760"/>
+      <p2 x="20" y="-680"/>
     </wire>
     <wire>
-      <p1 x="440" y="-260"/>
-      <p2 x="440" y="-20"/>
+      <p1 x="-120" y="-920"/>
+      <p2 x="-120" y="-780"/>
+    </wire>
+    <wire>
+      <p1 x="120" y="-1040"/>
+      <p2 x="120" y="-960"/>
+    </wire>
+    <wire>
+      <p1 x="120" y="-960"/>
+      <p2 x="120" y="-880"/>
+    </wire>
+    <wire>
+      <p1 x="120" y="-880"/>
+      <p2 x="120" y="-800"/>
+    </wire>
+    <wire>
+      <p1 x="120" y="-800"/>
+      <p2 x="120" y="-740"/>
     </wire>
     <wire>
       <p1 x="440" y="-1180"/>
       <p2 x="440" y="-1060"/>
     </wire>
+    <wire>
+      <p1 x="440" y="-820"/>
+      <p2 x="440" y="-660"/>
+    </wire>
+    <wire>
+      <p1 x="440" y="-260"/>
+      <p2 x="440" y="-20"/>
+    </wire>
     <wire>
       <p1 x="440" y="-660"/>
       <p2 x="440" y="-260"/>
@@ -1612,7 +1556,7 @@
     </wire>
     <wire>
       <p1 x="440" y="-980"/>
-      <p2 x="440" y="-660"/>
+      <p2 x="440" y="-820"/>
     </wire>
     <wire>
       <p1 x="600" y="-1080"/>
@@ -1654,22 +1598,6 @@
       <p1 x="600" y="760"/>
       <p2 x="600" y="840"/>
     </wire>
-    <wire>
-      <p1 x="-220" y="-1160"/>
-      <p2 x="-220" y="-1080"/>
-    </wire>
-    <wire>
-      <p1 x="-220" y="-920"/>
-      <p2 x="-220" y="-900"/>
-    </wire>
-    <wire>
-      <p1 x="-220" y="-1000"/>
-      <p2 x="-220" y="-920"/>
-    </wire>
-    <wire>
-      <p1 x="-220" y="-1080"/>
-      <p2 x="-220" y="-1000"/>
-    </wire>
     <wire>
       <p1 x="380" y="-1180"/>
       <p2 x="380" y="-1160"/>
@@ -1719,12 +1647,8 @@
       <p2 x="380" y="-380"/>
     </wire>
     <wire>
-      <p1 x="-480" y="-1040"/>
-      <p2 x="-480" y="-780"/>
-    </wire>
-    <wire>
-      <p1 x="-320" y="-880"/>
-      <p2 x="-320" y="-640"/>
+      <p1 x="-160" y="-1080"/>
+      <p2 x="-160" y="-720"/>
     </wire>
   </wires>
 </circuit>
\ No newline at end of file
diff --git a/src/main/dig/74xx/lib/7448.dig b/src/main/dig/74xx/lib/7448.dig
index b22b2963b..aa01ba894 100644
--- a/src/main/dig/74xx/lib/7448.dig
+++ b/src/main/dig/74xx/lib/7448.dig
@@ -172,6 +172,10 @@
     <visualElement>
       <elementName>Out</elementName>
       <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>ripple blanking output (LOW active)</string>
+        </entry>
         <entry>
           <string>Label</string>
           <string>~RBO</string>
@@ -186,6 +190,10 @@
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>ripple blanking input (LOW active)</string>
+        </entry>
         <entry>
           <string>Label</string>
           <string>~RBI</string>
@@ -242,7 +250,7 @@
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>a</string>
+          <string>~a</string>
         </entry>
         <entry>
           <string>pinNumber</string>
@@ -300,7 +308,7 @@
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>b</string>
+          <string>~b</string>
         </entry>
         <entry>
           <string>pinNumber</string>
@@ -343,7 +351,7 @@
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>c</string>
+          <string>~c</string>
         </entry>
         <entry>
           <string>pinNumber</string>
@@ -376,7 +384,7 @@
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>d</string>
+          <string>~d</string>
         </entry>
         <entry>
           <string>pinNumber</string>
@@ -419,7 +427,7 @@
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>e</string>
+          <string>~e</string>
         </entry>
         <entry>
           <string>pinNumber</string>
@@ -447,7 +455,7 @@
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>f</string>
+          <string>~f</string>
         </entry>
         <entry>
           <string>pinNumber</string>
@@ -485,7 +493,7 @@
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>g</string>
+          <string>~g</string>
         </entry>
         <entry>
           <string>pinNumber</string>
@@ -561,6 +569,10 @@
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>lamp test</string>
+        </entry>
         <entry>
           <string>rotation</string>
           <rotation rotation="3"/>
diff --git a/src/main/java/de/neemann/digital/draw/shapes/DILShape.java b/src/main/java/de/neemann/digital/draw/shapes/DILShape.java
index 95d8ee5e1..2210153cc 100644
--- a/src/main/java/de/neemann/digital/draw/shapes/DILShape.java
+++ b/src/main/java/de/neemann/digital/draw/shapes/DILShape.java
@@ -69,6 +69,7 @@ public class DILShape implements Shape {
         int pin = dp / 4;
         int x = width * SIZE;
         int h = (pinCount / 2) * dp - SIZE;
+
         for (int i = 0; i < pinCount / 2; i++) {
             int y = i * dp;
             graphic.drawPolygon(
@@ -86,6 +87,7 @@ public class DILShape implements Shape {
                             .add(x - pin, y + pin), Style.NORMAL);
             graphic.drawText(new Vector(x - pin - SIZE2 / 2, y), new Vector(x - pin + SIZE, y), map.getText(pinCount - i), Orientation.RIGHTCENTER, Style.SHAPE_PIN);
         }
+
         graphic.drawPolygon(
                 new Polygon(true)
                         .add(pin, -SIZE)
@@ -96,13 +98,14 @@ public class DILShape implements Shape {
                         .add(x - pin, h)
                         .add(pin, h), Style.NORMAL);
         graphic.drawText(new Vector(x / 2, SIZE2), new Vector(x / 2, SIZE * 2), shortName, Orientation.LEFTCENTER, Style.NORMAL_TEXT);
+
         if (label != null && label.length() > 0)
             graphic.drawText(new Vector(x / 2, h + SIZE2), new Vector(x, h + SIZE2), label, Orientation.CENTERTOP, Style.NORMAL_TEXT);
     }
 
     private static final class ShapePinMap {
         private final int width;
-        private HashMap<Integer, PinDescription> map;
+        private final HashMap<Integer, PinDescription> map;
         private ArrayList<PinDescription> notAssigned;
         private int pinCount;