diff --git a/src/main/dig/combinatorial/FullAdder.dig b/src/main/dig/combinatorial/FullAdder.dig
index 5f3e1256f..efa7c4c03 100644
--- a/src/main/dig/combinatorial/FullAdder.dig
+++ b/src/main/dig/combinatorial/FullAdder.dig
@@ -135,12 +135,12 @@
     <visualElement>
       <elementName>XOr</elementName>
       <elementAttributes/>
-      <pos x="600" y="320"/>
+      <pos x="620" y="320"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
       <elementAttributes/>
-      <pos x="600" y="240"/>
+      <pos x="620" y="240"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
@@ -165,7 +165,7 @@
           <string>A_i</string>
         </entry>
       </elementAttributes>
-      <pos x="540" y="240"/>
+      <pos x="560" y="240"/>
     </visualElement>
     <visualElement>
       <elementName>Or</elementName>
@@ -185,7 +185,7 @@
           <string>B_i</string>
         </entry>
       </elementAttributes>
-      <pos x="540" y="360"/>
+      <pos x="560" y="360"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -200,7 +200,7 @@
           <string>C_{i-1}</string>
         </entry>
       </elementAttributes>
-      <pos x="540" y="460"/>
+      <pos x="560" y="460"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -255,39 +255,39 @@ end loop
   </visualElements>
   <wires>
     <wire>
-      <p1 x="580" y="280"/>
-      <p2 x="560" y="320"/>
+      <p1 x="600" y="280"/>
+      <p2 x="580" y="320"/>
     </wire>
     <wire>
       <p1 x="720" y="380"/>
       <p2 x="700" y="420"/>
     </wire>
     <wire>
-      <p1 x="560" y="280"/>
-      <p2 x="580" y="320"/>
+      <p1 x="580" y="280"/>
+      <p2 x="600" y="320"/>
     </wire>
     <wire>
       <p1 x="700" y="380"/>
       <p2 x="720" y="420"/>
     </wire>
     <wire>
-      <p1 x="580" y="320"/>
-      <p2 x="600" y="320"/>
-    </wire>
-    <wire>
-      <p1 x="540" y="240"/>
-      <p2 x="560" y="240"/>
+      <p1 x="600" y="320"/>
+      <p2 x="620" y="320"/>
     </wire>
     <wire>
       <p1 x="560" y="240"/>
-      <p2 x="600" y="240"/>
+      <p2 x="580" y="240"/>
     </wire>
     <wire>
-      <p1 x="660" y="260"/>
+      <p1 x="580" y="240"/>
+      <p2 x="620" y="240"/>
+    </wire>
+    <wire>
+      <p1 x="680" y="260"/>
       <p2 x="840" y="260"/>
     </wire>
     <wire>
-      <p1 x="660" y="340"/>
+      <p1 x="680" y="340"/>
       <p2 x="700" y="340"/>
     </wire>
     <wire>
@@ -299,24 +299,24 @@ end loop
       <p2 x="740" y="420"/>
     </wire>
     <wire>
-      <p1 x="580" y="280"/>
-      <p2 x="600" y="280"/>
+      <p1 x="600" y="280"/>
+      <p2 x="620" y="280"/>
     </wire>
     <wire>
       <p1 x="900" y="280"/>
       <p2 x="920" y="280"/>
     </wire>
     <wire>
-      <p1 x="540" y="360"/>
-      <p2 x="560" y="360"/>
+      <p1 x="560" y="360"/>
+      <p2 x="580" y="360"/>
     </wire>
     <wire>
       <p1 x="800" y="360"/>
       <p2 x="820" y="360"/>
     </wire>
     <wire>
-      <p1 x="560" y="360"/>
-      <p2 x="600" y="360"/>
+      <p1 x="580" y="360"/>
+      <p2 x="620" y="360"/>
     </wire>
     <wire>
       <p1 x="800" y="440"/>
@@ -331,7 +331,7 @@ end loop
       <p2 x="740" y="380"/>
     </wire>
     <wire>
-      <p1 x="540" y="460"/>
+      <p1 x="560" y="460"/>
       <p2 x="700" y="460"/>
     </wire>
     <wire>
@@ -339,12 +339,12 @@ end loop
       <p2 x="740" y="460"/>
     </wire>
     <wire>
-      <p1 x="560" y="240"/>
-      <p2 x="560" y="280"/>
+      <p1 x="580" y="240"/>
+      <p2 x="580" y="280"/>
     </wire>
     <wire>
-      <p1 x="560" y="320"/>
-      <p2 x="560" y="360"/>
+      <p1 x="580" y="320"/>
+      <p2 x="580" y="360"/>
     </wire>
     <wire>
       <p1 x="820" y="300"/>
diff --git a/src/main/dig/combinatorial/HalfAdder.dig b/src/main/dig/combinatorial/HalfAdder.dig
index 5e5383387..c66151a3c 100644
--- a/src/main/dig/combinatorial/HalfAdder.dig
+++ b/src/main/dig/combinatorial/HalfAdder.dig
@@ -72,12 +72,12 @@
   </visualElements>
   <wires>
     <wire>
-      <p1 x="560" y="240"/>
-      <p2 x="580" y="320"/>
+      <p1 x="580" y="280"/>
+      <p2 x="560" y="320"/>
     </wire>
     <wire>
-      <p1 x="580" y="280"/>
-      <p2 x="560" y="360"/>
+      <p1 x="560" y="280"/>
+      <p2 x="580" y="320"/>
     </wire>
     <wire>
       <p1 x="580" y="320"/>
@@ -111,5 +111,13 @@
       <p1 x="560" y="360"/>
       <p2 x="600" y="360"/>
     </wire>
+    <wire>
+      <p1 x="560" y="240"/>
+      <p2 x="560" y="280"/>
+    </wire>
+    <wire>
+      <p1 x="560" y="320"/>
+      <p2 x="560" y="360"/>
+    </wire>
   </wires>
 </circuit>
\ No newline at end of file
diff --git a/src/main/dig/combinatorial/HalfSub.dig b/src/main/dig/combinatorial/HalfSub.dig
index 109091182..e2f4b290f 100644
--- a/src/main/dig/combinatorial/HalfSub.dig
+++ b/src/main/dig/combinatorial/HalfSub.dig
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <circuit>
   <version>1</version>
+  <attributes/>
   <visualElements>
     <visualElement>
       <elementName>XOr</elementName>
@@ -9,7 +10,14 @@
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
-      <elementAttributes/>
+      <elementAttributes>
+        <entry>
+          <string>inverterConfig</string>
+          <inverterConfig>
+            <string>In_1</string>
+          </inverterConfig>
+        </entry>
+      </elementAttributes>
       <pos x="620" y="320"/>
     </visualElement>
     <visualElement>
@@ -20,7 +28,7 @@
           <string>$A$</string>
         </entry>
       </elementAttributes>
-      <pos x="500" y="240"/>
+      <pos x="520" y="240"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -30,7 +38,7 @@
           <string>$B$</string>
         </entry>
       </elementAttributes>
-      <pos x="500" y="360"/>
+      <pos x="520" y="360"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -52,11 +60,6 @@
       </elementAttributes>
       <pos x="720" y="340"/>
     </visualElement>
-    <visualElement>
-      <elementName>Not</elementName>
-      <elementAttributes/>
-      <pos x="540" y="320"/>
-    </visualElement>
     <visualElement>
       <elementName>Testcase</elementName>
       <elementAttributes>
@@ -77,20 +80,24 @@
   </visualElements>
   <wires>
     <wire>
-      <p1 x="500" y="240"/>
-      <p2 x="520" y="240"/>
+      <p1 x="580" y="280"/>
+      <p2 x="540" y="320"/>
+    </wire>
+    <wire>
+      <p1 x="540" y="280"/>
+      <p2 x="580" y="320"/>
     </wire>
     <wire>
       <p1 x="520" y="240"/>
+      <p2 x="540" y="240"/>
+    </wire>
+    <wire>
+      <p1 x="540" y="240"/>
       <p2 x="620" y="240"/>
     </wire>
     <wire>
       <p1 x="580" y="320"/>
-      <p2 x="620" y="320"/>
-    </wire>
-    <wire>
-      <p1 x="520" y="320"/>
-      <p2 x="540" y="320"/>
+      <p2 x="600" y="320"/>
     </wire>
     <wire>
       <p1 x="680" y="260"/>
@@ -101,24 +108,24 @@
       <p2 x="720" y="340"/>
     </wire>
     <wire>
-      <p1 x="600" y="280"/>
+      <p1 x="580" y="280"/>
       <p2 x="620" y="280"/>
     </wire>
     <wire>
-      <p1 x="500" y="360"/>
-      <p2 x="600" y="360"/>
+      <p1 x="520" y="360"/>
+      <p2 x="540" y="360"/>
     </wire>
     <wire>
-      <p1 x="600" y="360"/>
+      <p1 x="540" y="360"/>
       <p2 x="620" y="360"/>
     </wire>
     <wire>
-      <p1 x="600" y="280"/>
-      <p2 x="600" y="360"/>
+      <p1 x="540" y="240"/>
+      <p2 x="540" y="280"/>
     </wire>
     <wire>
-      <p1 x="520" y="240"/>
-      <p2 x="520" y="320"/>
+      <p1 x="540" y="320"/>
+      <p2 x="540" y="360"/>
     </wire>
   </wires>
 </circuit>
\ No newline at end of file
diff --git a/src/test/resources/dig/test/arith/FullSub.dig b/src/test/resources/dig/test/arith/FullSub.dig
index fa636eab7..7f27fe064 100644
--- a/src/test/resources/dig/test/arith/FullSub.dig
+++ b/src/test/resources/dig/test/arith/FullSub.dig
@@ -37,7 +37,7 @@
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>BO_i-1</string>
+          <string>BO_{i-1}</string>
         </entry>
       </elementAttributes>
       <pos x="220" y="200"/>
@@ -83,7 +83,7 @@
         <entry>
           <string>Testdata</string>
           <testData>
-            <dataString>A_i B_i BO_i-1  BO_i S_i
+            <dataString>A_i B_i BO_{i-1}  BO_i S_i
  0   0   0        0   0
  0   0   1        1   1
  0   1   0        1   1
diff --git a/src/test/resources/dig/test/arith/HalfAdder.dig b/src/test/resources/dig/test/arith/HalfAdder.dig
index 5e5383387..c66151a3c 100644
--- a/src/test/resources/dig/test/arith/HalfAdder.dig
+++ b/src/test/resources/dig/test/arith/HalfAdder.dig
@@ -72,12 +72,12 @@
   </visualElements>
   <wires>
     <wire>
-      <p1 x="560" y="240"/>
-      <p2 x="580" y="320"/>
+      <p1 x="580" y="280"/>
+      <p2 x="560" y="320"/>
     </wire>
     <wire>
-      <p1 x="580" y="280"/>
-      <p2 x="560" y="360"/>
+      <p1 x="560" y="280"/>
+      <p2 x="580" y="320"/>
     </wire>
     <wire>
       <p1 x="580" y="320"/>
@@ -111,5 +111,13 @@
       <p1 x="560" y="360"/>
       <p2 x="600" y="360"/>
     </wire>
+    <wire>
+      <p1 x="560" y="240"/>
+      <p2 x="560" y="280"/>
+    </wire>
+    <wire>
+      <p1 x="560" y="320"/>
+      <p2 x="560" y="360"/>
+    </wire>
   </wires>
 </circuit>
\ No newline at end of file
diff --git a/src/test/resources/dig/test/arith/HalfSub.dig b/src/test/resources/dig/test/arith/HalfSub.dig
index 109091182..b82c26c62 100644
--- a/src/test/resources/dig/test/arith/HalfSub.dig
+++ b/src/test/resources/dig/test/arith/HalfSub.dig
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <circuit>
   <version>1</version>
+  <attributes/>
   <visualElements>
     <visualElement>
       <elementName>XOr</elementName>
@@ -9,7 +10,14 @@
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
-      <elementAttributes/>
+      <elementAttributes>
+        <entry>
+          <string>inverterConfig</string>
+          <inverterConfig>
+            <string>In_1</string>
+          </inverterConfig>
+        </entry>
+      </elementAttributes>
       <pos x="620" y="320"/>
     </visualElement>
     <visualElement>
@@ -20,7 +28,7 @@
           <string>$A$</string>
         </entry>
       </elementAttributes>
-      <pos x="500" y="240"/>
+      <pos x="540" y="240"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -30,7 +38,7 @@
           <string>$B$</string>
         </entry>
       </elementAttributes>
-      <pos x="500" y="360"/>
+      <pos x="540" y="360"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -52,11 +60,6 @@
       </elementAttributes>
       <pos x="720" y="340"/>
     </visualElement>
-    <visualElement>
-      <elementName>Not</elementName>
-      <elementAttributes/>
-      <pos x="540" y="320"/>
-    </visualElement>
     <visualElement>
       <elementName>Testcase</elementName>
       <elementAttributes>
@@ -77,21 +80,21 @@
   </visualElements>
   <wires>
     <wire>
-      <p1 x="500" y="240"/>
-      <p2 x="520" y="240"/>
+      <p1 x="560" y="280"/>
+      <p2 x="600" y="320"/>
     </wire>
     <wire>
-      <p1 x="520" y="240"/>
+      <p1 x="600" y="280"/>
+      <p2 x="560" y="320"/>
+    </wire>
+    <wire>
+      <p1 x="540" y="240"/>
+      <p2 x="560" y="240"/>
+    </wire>
+    <wire>
+      <p1 x="560" y="240"/>
       <p2 x="620" y="240"/>
     </wire>
-    <wire>
-      <p1 x="580" y="320"/>
-      <p2 x="620" y="320"/>
-    </wire>
-    <wire>
-      <p1 x="520" y="320"/>
-      <p2 x="540" y="320"/>
-    </wire>
     <wire>
       <p1 x="680" y="260"/>
       <p2 x="720" y="260"/>
@@ -105,20 +108,20 @@
       <p2 x="620" y="280"/>
     </wire>
     <wire>
-      <p1 x="500" y="360"/>
-      <p2 x="600" y="360"/>
+      <p1 x="540" y="360"/>
+      <p2 x="560" y="360"/>
     </wire>
     <wire>
-      <p1 x="600" y="360"/>
+      <p1 x="560" y="360"/>
       <p2 x="620" y="360"/>
     </wire>
     <wire>
-      <p1 x="600" y="280"/>
-      <p2 x="600" y="360"/>
+      <p1 x="560" y="240"/>
+      <p2 x="560" y="280"/>
     </wire>
     <wire>
-      <p1 x="520" y="240"/>
-      <p2 x="520" y="320"/>
+      <p1 x="560" y="320"/>
+      <p2 x="560" y="360"/>
     </wire>
   </wires>
 </circuit>
\ No newline at end of file