diff --git a/Scores/Invencao_Em_7_1_2.mscx b/Scores/Invencao_Em_7_1_2.mscx
index c6481c9..158bb95 100644
--- a/Scores/Invencao_Em_7_1_2.mscx
+++ b/Scores/Invencao_Em_7_1_2.mscx
@@ -3,6 +3,7 @@
   <programVersion>3.3.4</programVersion>
   <programRevision>7684abe</programRevision>
   <Score>
+    <layoutMode>line</layoutMode>
     <LayerTag id="0" tag="default"></LayerTag>
     <currentLayer>0</currentLayer>
     <Division>480</Division>
@@ -3071,7 +3072,7 @@ Transcribed by Joshua Moerman
             </Chord>
           <Chord>
             <linkedMain/>
-            <durationType>quarter</durationType>
+            <durationType>half</durationType>
             <Note>
               <linkedMain/>
               <pitch>57</pitch>
@@ -3080,10 +3081,6 @@ Transcribed by Joshua Moerman
               <string>2</string>
               </Note>
             </Chord>
-          <Rest>
-            <linkedMain/>
-            <durationType>quarter</durationType>
-            </Rest>
           <BarLine>
             <subtype>double</subtype>
             </BarLine>
@@ -3205,10 +3202,9 @@ Transcribed by Joshua Moerman
             </Chord>
           </voice>
         <voice>
-          <Rest>
-            <linkedMain/>
-            <durationType>half</durationType>
-            </Rest>
+          <location>
+            <fractions>1/2</fractions>
+            </location>
           <Chord>
             <linkedMain/>
             <durationType>half</durationType>
@@ -4392,7 +4388,7 @@ Transcribed by Joshua Moerman
             </Chord>
           <Chord>
             <linkedMain/>
-            <durationType>16th</durationType>
+            <durationType>eighth</durationType>
             <Articulation>
               <subtype>ornamentMordent</subtype>
               <linkedMain/>
@@ -4408,17 +4404,6 @@ Transcribed by Joshua Moerman
               <string>0</string>
               </Note>
             </Chord>
-          <Chord>
-            <linkedMain/>
-            <durationType>16th</durationType>
-            <Note>
-              <linkedMain/>
-              <pitch>66</pitch>
-              <tpc>20</tpc>
-              <fret>2</fret>
-              <string>0</string>
-              </Note>
-            </Chord>
           <Chord>
             <linkedMain/>
             <durationType>half</durationType>
@@ -4552,13 +4537,6 @@ Transcribed by Joshua Moerman
               </Note>
             </Chord>
           </voice>
-        <voice>
-          <Rest>
-            <linkedMain/>
-            <durationType>measure</durationType>
-            <duration>4/4</duration>
-            </Rest>
-          </voice>
         </Measure>
       <Measure>
         <voice>
@@ -4937,7 +4915,7 @@ Transcribed by Joshua Moerman
             </Chord>
           <Chord>
             <linkedMain/>
-            <durationType>16th</durationType>
+            <durationType>eighth</durationType>
             <Articulation>
               <subtype>ornamentMordent</subtype>
               <linkedMain/>
@@ -4950,17 +4928,6 @@ Transcribed by Joshua Moerman
               <string>0</string>
               </Note>
             </Chord>
-          <Chord>
-            <linkedMain/>
-            <durationType>16th</durationType>
-            <Note>
-              <linkedMain/>
-              <pitch>71</pitch>
-              <tpc>19</tpc>
-              <fret>7</fret>
-              <string>0</string>
-              </Note>
-            </Chord>
           <Chord>
             <linkedMain/>
             <durationType>eighth</durationType>
@@ -4973,13 +4940,6 @@ Transcribed by Joshua Moerman
               </Note>
             </Chord>
           </voice>
-        <voice>
-          <Rest>
-            <linkedMain/>
-            <durationType>measure</durationType>
-            <duration>4/4</duration>
-            </Rest>
-          </voice>
         </Measure>
       <Measure>
         <voice>
@@ -5196,7 +5156,7 @@ Transcribed by Joshua Moerman
             </Chord>
           <Chord>
             <linkedMain/>
-            <durationType>quarter</durationType>
+            <durationType>half</durationType>
             <Note>
               <linkedMain/>
               <pitch>72</pitch>
@@ -5205,16 +5165,11 @@ Transcribed by Joshua Moerman
               <string>0</string>
               </Note>
             </Chord>
-          <Rest>
-            <linkedMain/>
-            <durationType>quarter</durationType>
-            </Rest>
           </voice>
         <voice>
-          <Rest>
-            <linkedMain/>
-            <durationType>half</durationType>
-            </Rest>
+          <location>
+            <fractions>1/2</fractions>
+            </location>
           <Chord>
             <linkedMain/>
             <durationType>half</durationType>
@@ -5243,7 +5198,7 @@ Transcribed by Joshua Moerman
             </Chord>
           <Chord>
             <linkedMain/>
-            <durationType>16th</durationType>
+            <durationType>eighth</durationType>
             <Articulation>
               <subtype>ornamentMordent</subtype>
               <linkedMain/>
@@ -5256,17 +5211,6 @@ Transcribed by Joshua Moerman
               <string>0</string>
               </Note>
             </Chord>
-          <Chord>
-            <linkedMain/>
-            <durationType>16th</durationType>
-            <Note>
-              <linkedMain/>
-              <pitch>71</pitch>
-              <tpc>19</tpc>
-              <fret>7</fret>
-              <string>0</string>
-              </Note>
-            </Chord>
           <Chord>
             <linkedMain/>
             <durationType>eighth</durationType>
@@ -5302,7 +5246,7 @@ Transcribed by Joshua Moerman
             </Chord>
           <Chord>
             <linkedMain/>
-            <durationType>16th</durationType>
+            <durationType>eighth</durationType>
             <Articulation>
               <subtype>ornamentMordent</subtype>
               <linkedMain/>
@@ -5315,17 +5259,6 @@ Transcribed by Joshua Moerman
               <string>0</string>
               </Note>
             </Chord>
-          <Chord>
-            <linkedMain/>
-            <durationType>16th</durationType>
-            <Note>
-              <linkedMain/>
-              <pitch>71</pitch>
-              <tpc>19</tpc>
-              <fret>7</fret>
-              <string>0</string>
-              </Note>
-            </Chord>
           <Chord>
             <linkedMain/>
             <durationType>eighth</durationType>
@@ -5349,13 +5282,6 @@ Transcribed by Joshua Moerman
               </Note>
             </Chord>
           </voice>
-        <voice>
-          <Rest>
-            <linkedMain/>
-            <durationType>measure</durationType>
-            <duration>4/4</duration>
-            </Rest>
-          </voice>
         </Measure>
       <Measure>
         <voice>
@@ -5959,10 +5885,9 @@ Transcribed by Joshua Moerman
             </Chord>
           </voice>
         <voice>
-          <Rest>
-            <linkedMain/>
-            <durationType>half</durationType>
-            </Rest>
+          <location>
+            <fractions>1/2</fractions>
+            </location>
           <Chord>
             <linkedMain/>
             <durationType>half</durationType>
@@ -6046,7 +5971,7 @@ Transcribed by Joshua Moerman
             </Chord>
           <Chord>
             <linkedMain/>
-            <durationType>16th</durationType>
+            <durationType>eighth</durationType>
             <Articulation>
               <subtype>ornamentMordent</subtype>
               <linkedMain/>
@@ -6059,17 +5984,6 @@ Transcribed by Joshua Moerman
               <string>2</string>
               </Note>
             </Chord>
-          <Chord>
-            <linkedMain/>
-            <durationType>16th</durationType>
-            <Note>
-              <linkedMain/>
-              <pitch>55</pitch>
-              <tpc>15</tpc>
-              <fret>0</fret>
-              <string>2</string>
-              </Note>
-            </Chord>
           <Chord>
             <linkedMain/>
             <durationType>eighth</durationType>
@@ -6085,13 +5999,6 @@ Transcribed by Joshua Moerman
               </Note>
             </Chord>
           </voice>
-        <voice>
-          <Rest>
-            <linkedMain/>
-            <durationType>measure</durationType>
-            <duration>4/4</duration>
-            </Rest>
-          </voice>
         </Measure>
       <Measure>
         <voice>
@@ -6419,10 +6326,9 @@ Transcribed by Joshua Moerman
             </Chord>
           </voice>
         <voice>
-          <Rest>
-            <linkedMain/>
-            <durationType>half</durationType>
-            </Rest>
+          <location>
+            <fractions>1/2</fractions>
+            </location>
           <Chord>
             <linkedMain/>
             <durationType>quarter</durationType>
@@ -7034,7 +6940,7 @@ Transcribed by Joshua Moerman
             </Chord>
           <Chord>
             <linkedMain/>
-            <durationType>16th</durationType>
+            <durationType>eighth</durationType>
             <Articulation>
               <subtype>ornamentMordent</subtype>
               <linkedMain/>
@@ -7047,17 +6953,6 @@ Transcribed by Joshua Moerman
               <string>3</string>
               </Note>
             </Chord>
-          <Chord>
-            <linkedMain/>
-            <durationType>16th</durationType>
-            <Note>
-              <linkedMain/>
-              <pitch>50</pitch>
-              <tpc>16</tpc>
-              <fret>0</fret>
-              <string>3</string>
-              </Note>
-            </Chord>
           <Rest>
             <linkedMain/>
             <durationType>eighth</durationType>
@@ -9032,7 +8927,7 @@ Transcribed by Joshua Moerman
             </Dynamic>
           <Chord>
             <linkedMain/>
-            <durationType>16th</durationType>
+            <durationType>eighth</durationType>
             <Articulation>
               <subtype>ornamentMordent</subtype>
               <linkedMain/>
@@ -9045,17 +8940,6 @@ Transcribed by Joshua Moerman
               <string>0</string>
               </Note>
             </Chord>
-          <Chord>
-            <linkedMain/>
-            <durationType>16th</durationType>
-            <Note>
-              <linkedMain/>
-              <pitch>71</pitch>
-              <tpc>19</tpc>
-              <fret>7</fret>
-              <string>0</string>
-              </Note>
-            </Chord>
           <Chord>
             <linkedMain/>
             <durationType>eighth</durationType>
@@ -9369,7 +9253,7 @@ Transcribed by Joshua Moerman
             </Chord>
           <Chord>
             <linkedMain/>
-            <durationType>16th</durationType>
+            <durationType>eighth</durationType>
             <Articulation>
               <subtype>ornamentMordent</subtype>
               <linkedMain/>
@@ -9382,17 +9266,6 @@ Transcribed by Joshua Moerman
               <string>0</string>
               </Note>
             </Chord>
-          <Chord>
-            <linkedMain/>
-            <durationType>16th</durationType>
-            <Note>
-              <linkedMain/>
-              <pitch>69</pitch>
-              <tpc>17</tpc>
-              <fret>5</fret>
-              <string>0</string>
-              </Note>
-            </Chord>
           <Chord>
             <linkedMain/>
             <durationType>eighth</durationType>
@@ -9406,7 +9279,7 @@ Transcribed by Joshua Moerman
             </Chord>
           <Chord>
             <linkedMain/>
-            <durationType>16th</durationType>
+            <durationType>eighth</durationType>
             <Articulation>
               <subtype>ornamentMordent</subtype>
               <linkedMain/>
@@ -9419,17 +9292,6 @@ Transcribed by Joshua Moerman
               <string>0</string>
               </Note>
             </Chord>
-          <Chord>
-            <linkedMain/>
-            <durationType>16th</durationType>
-            <Note>
-              <linkedMain/>
-              <pitch>71</pitch>
-              <tpc>19</tpc>
-              <fret>7</fret>
-              <string>0</string>
-              </Note>
-            </Chord>
           <Chord>
             <linkedMain/>
             <durationType>eighth</durationType>
@@ -9454,10 +9316,9 @@ Transcribed by Joshua Moerman
             </Chord>
           </voice>
         <voice>
-          <Rest>
-            <linkedMain/>
-            <durationType>half</durationType>
-            </Rest>
+          <location>
+            <fractions>1/2</fractions>
+            </location>
           <Chord>
             <linkedMain/>
             <durationType>half</durationType>
@@ -9573,13 +9434,6 @@ Transcribed by Joshua Moerman
               </Note>
             </Chord>
           </voice>
-        <voice>
-          <Rest>
-            <linkedMain/>
-            <durationType>measure</durationType>
-            <duration>4/4</duration>
-            </Rest>
-          </voice>
         </Measure>
       <Measure>
         <voice>
@@ -9681,17 +9535,10 @@ Transcribed by Joshua Moerman
         </Measure>
       <Measure>
         <voice>
-          <Chord>
+          <Rest>
             <linkedMain/>
             <durationType>eighth</durationType>
-            <Note>
-              <linkedMain/>
-              <pitch>40</pitch>
-              <tpc>18</tpc>
-              <fret>0</fret>
-              <string>5</string>
-              </Note>
-            </Chord>
+            </Rest>
           <Chord>
             <linkedMain/>
             <durationType>eighth</durationType>
@@ -9728,17 +9575,10 @@ Transcribed by Joshua Moerman
               <string>0</string>
               </Note>
             </Chord>
-          <Chord>
+          <Rest>
             <linkedMain/>
             <durationType>eighth</durationType>
-            <Note>
-              <linkedMain/>
-              <pitch>45</pitch>
-              <tpc>17</tpc>
-              <fret>0</fret>
-              <string>4</string>
-              </Note>
-            </Chord>
+            </Rest>
           <Chord>
             <linkedMain/>
             <durationType>eighth</durationType>
@@ -9776,6 +9616,30 @@ Transcribed by Joshua Moerman
             <subtype>double</subtype>
             </BarLine>
           </voice>
+        <voice>
+          <Chord>
+            <linkedMain/>
+            <durationType>half</durationType>
+            <Note>
+              <linkedMain/>
+              <pitch>40</pitch>
+              <tpc>18</tpc>
+              <fret>0</fret>
+              <string>5</string>
+              </Note>
+            </Chord>
+          <Chord>
+            <linkedMain/>
+            <durationType>half</durationType>
+            <Note>
+              <linkedMain/>
+              <pitch>45</pitch>
+              <tpc>17</tpc>
+              <fret>0</fret>
+              <string>4</string>
+              </Note>
+            </Chord>
+          </voice>
         </Measure>
       <Measure>
         <voice>
@@ -10061,10 +9925,9 @@ Transcribed by Joshua Moerman
             </Chord>
           </voice>
         <voice>
-          <Rest>
-            <linkedMain/>
-            <durationType>half</durationType>
-            </Rest>
+          <location>
+            <fractions>1/2</fractions>
+            </location>
           <Chord>
             <linkedMain/>
             <durationType>half</durationType>
@@ -10082,7 +9945,7 @@ Transcribed by Joshua Moerman
         <voice>
           <Chord>
             <linkedMain/>
-            <durationType>16th</durationType>
+            <durationType>eighth</durationType>
             <Articulation>
               <subtype>ornamentMordent</subtype>
               <linkedMain/>
@@ -10095,17 +9958,6 @@ Transcribed by Joshua Moerman
               <string>0</string>
               </Note>
             </Chord>
-          <Chord>
-            <linkedMain/>
-            <durationType>16th</durationType>
-            <Note>
-              <linkedMain/>
-              <pitch>71</pitch>
-              <tpc>19</tpc>
-              <fret>7</fret>
-              <string>0</string>
-              </Note>
-            </Chord>
           <Chord>
             <linkedMain/>
             <durationType>16th</durationType>
@@ -10130,7 +9982,7 @@ Transcribed by Joshua Moerman
             </Chord>
           <Chord>
             <linkedMain/>
-            <durationType>16th</durationType>
+            <durationType>eighth</durationType>
             <Articulation>
               <subtype>ornamentMordent</subtype>
               <linkedMain/>
@@ -10146,17 +9998,6 @@ Transcribed by Joshua Moerman
               <string>1</string>
               </Note>
             </Chord>
-          <Chord>
-            <linkedMain/>
-            <durationType>16th</durationType>
-            <Note>
-              <linkedMain/>
-              <pitch>66</pitch>
-              <tpc>20</tpc>
-              <fret>7</fret>
-              <string>1</string>
-              </Note>
-            </Chord>
           <Chord>
             <linkedMain/>
             <durationType>16th</durationType>
@@ -10216,13 +10057,6 @@ Transcribed by Joshua Moerman
               </Note>
             </Chord>
           </voice>
-        <voice>
-          <Rest>
-            <linkedMain/>
-            <durationType>measure</durationType>
-            <duration>4/4</duration>
-            </Rest>
-          </voice>
         </Measure>
       <Measure>
         <voice>
@@ -16731,17 +16565,10 @@ Transcribed by Joshua Moerman
               <string>0</string>
               </Note>
             </Chord>
-          <Chord>
+          <Rest>
             <linkedMain/>
             <durationType>eighth</durationType>
-            <Note>
-              <linkedMain/>
-              <pitch>50</pitch>
-              <tpc>16</tpc>
-              <fret>0</fret>
-              <string>3</string>
-              </Note>
-            </Chord>
+            </Rest>
           <Chord>
             <linkedMain/>
             <durationType>eighth</durationType>
@@ -16779,6 +16606,22 @@ Transcribed by Joshua Moerman
               </Note>
             </Chord>
           </voice>
+        <voice>
+          <location>
+            <fractions>1/2</fractions>
+            </location>
+          <Chord>
+            <linkedMain/>
+            <durationType>half</durationType>
+            <Note>
+              <linkedMain/>
+              <pitch>50</pitch>
+              <tpc>16</tpc>
+              <fret>0</fret>
+              <string>3</string>
+              </Note>
+            </Chord>
+          </voice>
         </Measure>
       <Measure>
         <voice>
@@ -16977,10 +16820,9 @@ Transcribed by Joshua Moerman
             </Chord>
           </voice>
         <voice>
-          <Rest>
-            <linkedMain/>
-            <durationType>half</durationType>
-            </Rest>
+          <location>
+            <fractions>1/2</fractions>
+            </location>
           <Chord>
             <linkedMain/>
             <durationType>half</durationType>
@@ -17042,7 +16884,7 @@ Transcribed by Joshua Moerman
             </Chord>
           <Chord>
             <linkedMain/>
-            <durationType>16th</durationType>
+            <durationType>eighth</durationType>
             <Articulation>
               <subtype>ornamentMordent</subtype>
               <linkedMain/>
@@ -17055,17 +16897,6 @@ Transcribed by Joshua Moerman
               <string>2</string>
               </Note>
             </Chord>
-          <Chord>
-            <linkedMain/>
-            <durationType>16th</durationType>
-            <Note>
-              <linkedMain/>
-              <pitch>55</pitch>
-              <tpc>15</tpc>
-              <fret>0</fret>
-              <string>2</string>
-              </Note>
-            </Chord>
           <Chord>
             <linkedMain/>
             <durationType>16th</durationType>
@@ -20996,7 +20827,7 @@ Transcribed by Joshua Moerman
           <Chord>
             <linked>
               </linked>
-            <durationType>quarter</durationType>
+            <durationType>half</durationType>
             <Note>
               <linked>
                 </linked>
@@ -21006,11 +20837,6 @@ Transcribed by Joshua Moerman
               <string>2</string>
               </Note>
             </Chord>
-          <Rest>
-            <linked>
-              </linked>
-            <durationType>quarter</durationType>
-            </Rest>
           <BarLine>
             <subtype>double</subtype>
             </BarLine>
@@ -21152,11 +20978,9 @@ Transcribed by Joshua Moerman
             </Chord>
           </voice>
         <voice>
-          <Rest>
-            <linked>
-              </linked>
-            <durationType>half</durationType>
-            </Rest>
+          <location>
+            <fractions>1/2</fractions>
+            </location>
           <Chord>
             <linked>
               </linked>
@@ -22513,7 +22337,7 @@ Transcribed by Joshua Moerman
           <Chord>
             <linked>
               </linked>
-            <durationType>16th</durationType>
+            <durationType>eighth</durationType>
             <Articulation>
               <subtype>ornamentMordent</subtype>
               <linked>
@@ -22528,19 +22352,6 @@ Transcribed by Joshua Moerman
               <string>0</string>
               </Note>
             </Chord>
-          <Chord>
-            <linked>
-              </linked>
-            <durationType>16th</durationType>
-            <Note>
-              <linked>
-                </linked>
-              <pitch>66</pitch>
-              <tpc>20</tpc>
-              <fret>2</fret>
-              <string>0</string>
-              </Note>
-            </Chord>
           <Chord>
             <linked>
               </linked>
@@ -22681,14 +22492,6 @@ Transcribed by Joshua Moerman
               </Note>
             </Chord>
           </voice>
-        <voice>
-          <Rest>
-            <linked>
-              </linked>
-            <durationType>measure</durationType>
-            <duration>4/4</duration>
-            </Rest>
-          </voice>
         </Measure>
       <Measure>
         <voice>
@@ -23120,7 +22923,7 @@ Transcribed by Joshua Moerman
           <Chord>
             <linked>
               </linked>
-            <durationType>16th</durationType>
+            <durationType>eighth</durationType>
             <Articulation>
               <subtype>ornamentMordent</subtype>
               <linked>
@@ -23135,19 +22938,6 @@ Transcribed by Joshua Moerman
               <string>0</string>
               </Note>
             </Chord>
-          <Chord>
-            <linked>
-              </linked>
-            <durationType>16th</durationType>
-            <Note>
-              <linked>
-                </linked>
-              <pitch>71</pitch>
-              <tpc>19</tpc>
-              <fret>7</fret>
-              <string>0</string>
-              </Note>
-            </Chord>
           <Chord>
             <linked>
               </linked>
@@ -23162,14 +22952,6 @@ Transcribed by Joshua Moerman
               </Note>
             </Chord>
           </voice>
-        <voice>
-          <Rest>
-            <linked>
-              </linked>
-            <durationType>measure</durationType>
-            <duration>4/4</duration>
-            </Rest>
-          </voice>
         </Measure>
       <Measure>
         <voice>
@@ -23413,7 +23195,7 @@ Transcribed by Joshua Moerman
           <Chord>
             <linked>
               </linked>
-            <durationType>quarter</durationType>
+            <durationType>half</durationType>
             <Note>
               <linked>
                 </linked>
@@ -23423,18 +23205,11 @@ Transcribed by Joshua Moerman
               <string>0</string>
               </Note>
             </Chord>
-          <Rest>
-            <linked>
-              </linked>
-            <durationType>quarter</durationType>
-            </Rest>
           </voice>
         <voice>
-          <Rest>
-            <linked>
-              </linked>
-            <durationType>half</durationType>
-            </Rest>
+          <location>
+            <fractions>1/2</fractions>
+            </location>
           <Chord>
             <linked>
               </linked>
@@ -23468,7 +23243,7 @@ Transcribed by Joshua Moerman
           <Chord>
             <linked>
               </linked>
-            <durationType>16th</durationType>
+            <durationType>eighth</durationType>
             <Articulation>
               <subtype>ornamentMordent</subtype>
               <linked>
@@ -23483,19 +23258,6 @@ Transcribed by Joshua Moerman
               <string>0</string>
               </Note>
             </Chord>
-          <Chord>
-            <linked>
-              </linked>
-            <durationType>16th</durationType>
-            <Note>
-              <linked>
-                </linked>
-              <pitch>71</pitch>
-              <tpc>19</tpc>
-              <fret>7</fret>
-              <string>0</string>
-              </Note>
-            </Chord>
           <Chord>
             <linked>
               </linked>
@@ -23538,7 +23300,7 @@ Transcribed by Joshua Moerman
           <Chord>
             <linked>
               </linked>
-            <durationType>16th</durationType>
+            <durationType>eighth</durationType>
             <Articulation>
               <subtype>ornamentMordent</subtype>
               <linked>
@@ -23553,19 +23315,6 @@ Transcribed by Joshua Moerman
               <string>0</string>
               </Note>
             </Chord>
-          <Chord>
-            <linked>
-              </linked>
-            <durationType>16th</durationType>
-            <Note>
-              <linked>
-                </linked>
-              <pitch>71</pitch>
-              <tpc>19</tpc>
-              <fret>7</fret>
-              <string>0</string>
-              </Note>
-            </Chord>
           <Chord>
             <linked>
               </linked>
@@ -23593,14 +23342,6 @@ Transcribed by Joshua Moerman
               </Note>
             </Chord>
           </voice>
-        <voice>
-          <Rest>
-            <linked>
-              </linked>
-            <durationType>measure</durationType>
-            <duration>4/4</duration>
-            </Rest>
-          </voice>
         </Measure>
       <Measure>
         <voice>
@@ -24274,11 +24015,9 @@ Transcribed by Joshua Moerman
             </Chord>
           </voice>
         <voice>
-          <Rest>
-            <linked>
-              </linked>
-            <durationType>half</durationType>
-            </Rest>
+          <location>
+            <fractions>1/2</fractions>
+            </location>
           <Chord>
             <linked>
               </linked>
@@ -24377,7 +24116,7 @@ Transcribed by Joshua Moerman
           <Chord>
             <linked>
               </linked>
-            <durationType>16th</durationType>
+            <durationType>eighth</durationType>
             <Articulation>
               <subtype>ornamentMordent</subtype>
               <linked>
@@ -24392,19 +24131,6 @@ Transcribed by Joshua Moerman
               <string>2</string>
               </Note>
             </Chord>
-          <Chord>
-            <linked>
-              </linked>
-            <durationType>16th</durationType>
-            <Note>
-              <linked>
-                </linked>
-              <pitch>55</pitch>
-              <tpc>15</tpc>
-              <fret>0</fret>
-              <string>2</string>
-              </Note>
-            </Chord>
           <Chord>
             <linked>
               </linked>
@@ -24419,14 +24145,6 @@ Transcribed by Joshua Moerman
               </Note>
             </Chord>
           </voice>
-        <voice>
-          <Rest>
-            <linked>
-              </linked>
-            <durationType>measure</durationType>
-            <duration>4/4</duration>
-            </Rest>
-          </voice>
         </Measure>
       <Measure>
         <voice>
@@ -24800,11 +24518,9 @@ Transcribed by Joshua Moerman
             </Chord>
           </voice>
         <voice>
-          <Rest>
-            <linked>
-              </linked>
-            <durationType>half</durationType>
-            </Rest>
+          <location>
+            <fractions>1/2</fractions>
+            </location>
           <Chord>
             <linked>
               </linked>
@@ -25515,7 +25231,7 @@ Transcribed by Joshua Moerman
           <Chord>
             <linked>
               </linked>
-            <durationType>16th</durationType>
+            <durationType>eighth</durationType>
             <Articulation>
               <subtype>ornamentMordent</subtype>
               <linked>
@@ -25530,19 +25246,6 @@ Transcribed by Joshua Moerman
               <string>3</string>
               </Note>
             </Chord>
-          <Chord>
-            <linked>
-              </linked>
-            <durationType>16th</durationType>
-            <Note>
-              <linked>
-                </linked>
-              <pitch>50</pitch>
-              <tpc>16</tpc>
-              <fret>0</fret>
-              <string>3</string>
-              </Note>
-            </Chord>
           <Rest>
             <linked>
               </linked>
@@ -27658,7 +27361,7 @@ Transcribed by Joshua Moerman
           <Chord>
             <linked>
               </linked>
-            <durationType>16th</durationType>
+            <durationType>eighth</durationType>
             <Articulation>
               <subtype>ornamentMordent</subtype>
               <linked>
@@ -27673,19 +27376,6 @@ Transcribed by Joshua Moerman
               <string>0</string>
               </Note>
             </Chord>
-          <Chord>
-            <linked>
-              </linked>
-            <durationType>16th</durationType>
-            <Note>
-              <linked>
-                </linked>
-              <pitch>71</pitch>
-              <tpc>19</tpc>
-              <fret>7</fret>
-              <string>0</string>
-              </Note>
-            </Chord>
           <Chord>
             <linked>
               </linked>
@@ -28039,7 +27729,7 @@ Transcribed by Joshua Moerman
           <Chord>
             <linked>
               </linked>
-            <durationType>16th</durationType>
+            <durationType>eighth</durationType>
             <Articulation>
               <subtype>ornamentMordent</subtype>
               <linked>
@@ -28054,19 +27744,6 @@ Transcribed by Joshua Moerman
               <string>0</string>
               </Note>
             </Chord>
-          <Chord>
-            <linked>
-              </linked>
-            <durationType>16th</durationType>
-            <Note>
-              <linked>
-                </linked>
-              <pitch>69</pitch>
-              <tpc>17</tpc>
-              <fret>5</fret>
-              <string>0</string>
-              </Note>
-            </Chord>
           <Chord>
             <linked>
               </linked>
@@ -28083,7 +27760,7 @@ Transcribed by Joshua Moerman
           <Chord>
             <linked>
               </linked>
-            <durationType>16th</durationType>
+            <durationType>eighth</durationType>
             <Articulation>
               <subtype>ornamentMordent</subtype>
               <linked>
@@ -28098,19 +27775,6 @@ Transcribed by Joshua Moerman
               <string>0</string>
               </Note>
             </Chord>
-          <Chord>
-            <linked>
-              </linked>
-            <durationType>16th</durationType>
-            <Note>
-              <linked>
-                </linked>
-              <pitch>71</pitch>
-              <tpc>19</tpc>
-              <fret>7</fret>
-              <string>0</string>
-              </Note>
-            </Chord>
           <Chord>
             <linked>
               </linked>
@@ -28139,11 +27803,9 @@ Transcribed by Joshua Moerman
             </Chord>
           </voice>
         <voice>
-          <Rest>
-            <linked>
-              </linked>
-            <durationType>half</durationType>
-            </Rest>
+          <location>
+            <fractions>1/2</fractions>
+            </location>
           <Chord>
             <linked>
               </linked>
@@ -28279,14 +27941,6 @@ Transcribed by Joshua Moerman
               </Note>
             </Chord>
           </voice>
-        <voice>
-          <Rest>
-            <linked>
-              </linked>
-            <durationType>measure</durationType>
-            <duration>4/4</duration>
-            </Rest>
-          </voice>
         </Measure>
       <Measure>
         <voice>
@@ -28398,19 +28052,11 @@ Transcribed by Joshua Moerman
         </Measure>
       <Measure>
         <voice>
-          <Chord>
+          <Rest>
             <linked>
               </linked>
             <durationType>eighth</durationType>
-            <Note>
-              <linked>
-                </linked>
-              <pitch>40</pitch>
-              <tpc>18</tpc>
-              <fret>0</fret>
-              <string>5</string>
-              </Note>
-            </Chord>
+            </Rest>
           <Chord>
             <linked>
               </linked>
@@ -28450,19 +28096,11 @@ Transcribed by Joshua Moerman
               <string>0</string>
               </Note>
             </Chord>
-          <Chord>
+          <Rest>
             <linked>
               </linked>
             <durationType>eighth</durationType>
-            <Note>
-              <linked>
-                </linked>
-              <pitch>45</pitch>
-              <tpc>17</tpc>
-              <fret>0</fret>
-              <string>4</string>
-              </Note>
-            </Chord>
+            </Rest>
           <Chord>
             <linked>
               </linked>
@@ -28506,6 +28144,34 @@ Transcribed by Joshua Moerman
             <subtype>double</subtype>
             </BarLine>
           </voice>
+        <voice>
+          <Chord>
+            <linked>
+              </linked>
+            <durationType>half</durationType>
+            <Note>
+              <linked>
+                </linked>
+              <pitch>40</pitch>
+              <tpc>18</tpc>
+              <fret>0</fret>
+              <string>5</string>
+              </Note>
+            </Chord>
+          <Chord>
+            <linked>
+              </linked>
+            <durationType>half</durationType>
+            <Note>
+              <linked>
+                </linked>
+              <pitch>45</pitch>
+              <tpc>17</tpc>
+              <fret>0</fret>
+              <string>4</string>
+              </Note>
+            </Chord>
+          </voice>
         </Measure>
       <Measure>
         <voice>
@@ -28823,11 +28489,9 @@ Transcribed by Joshua Moerman
             </Chord>
           </voice>
         <voice>
-          <Rest>
-            <linked>
-              </linked>
-            <durationType>half</durationType>
-            </Rest>
+          <location>
+            <fractions>1/2</fractions>
+            </location>
           <Chord>
             <linked>
               </linked>
@@ -28848,7 +28512,7 @@ Transcribed by Joshua Moerman
           <Chord>
             <linked>
               </linked>
-            <durationType>16th</durationType>
+            <durationType>eighth</durationType>
             <Articulation>
               <subtype>ornamentMordent</subtype>
               <linked>
@@ -28863,19 +28527,6 @@ Transcribed by Joshua Moerman
               <string>0</string>
               </Note>
             </Chord>
-          <Chord>
-            <linked>
-              </linked>
-            <durationType>16th</durationType>
-            <Note>
-              <linked>
-                </linked>
-              <pitch>71</pitch>
-              <tpc>19</tpc>
-              <fret>7</fret>
-              <string>0</string>
-              </Note>
-            </Chord>
           <Chord>
             <linked>
               </linked>
@@ -28905,7 +28556,7 @@ Transcribed by Joshua Moerman
           <Chord>
             <linked>
               </linked>
-            <durationType>16th</durationType>
+            <durationType>eighth</durationType>
             <Articulation>
               <subtype>ornamentMordent</subtype>
               <linked>
@@ -28920,19 +28571,6 @@ Transcribed by Joshua Moerman
               <string>1</string>
               </Note>
             </Chord>
-          <Chord>
-            <linked>
-              </linked>
-            <durationType>16th</durationType>
-            <Note>
-              <linked>
-                </linked>
-              <pitch>66</pitch>
-              <tpc>20</tpc>
-              <fret>7</fret>
-              <string>1</string>
-              </Note>
-            </Chord>
           <Chord>
             <linked>
               </linked>
@@ -28999,14 +28637,6 @@ Transcribed by Joshua Moerman
               </Note>
             </Chord>
           </voice>
-        <voice>
-          <Rest>
-            <linked>
-              </linked>
-            <durationType>measure</durationType>
-            <duration>4/4</duration>
-            </Rest>
-          </voice>
         </Measure>
       <Measure>
         <voice>
@@ -35949,19 +35579,11 @@ Transcribed by Joshua Moerman
               <string>0</string>
               </Note>
             </Chord>
-          <Chord>
+          <Rest>
             <linked>
               </linked>
             <durationType>eighth</durationType>
-            <Note>
-              <linked>
-                </linked>
-              <pitch>50</pitch>
-              <tpc>16</tpc>
-              <fret>0</fret>
-              <string>3</string>
-              </Note>
-            </Chord>
+            </Rest>
           <Chord>
             <linked>
               </linked>
@@ -36002,6 +35624,24 @@ Transcribed by Joshua Moerman
               </Note>
             </Chord>
           </voice>
+        <voice>
+          <location>
+            <fractions>1/2</fractions>
+            </location>
+          <Chord>
+            <linked>
+              </linked>
+            <durationType>half</durationType>
+            <Note>
+              <linked>
+                </linked>
+              <pitch>50</pitch>
+              <tpc>16</tpc>
+              <fret>0</fret>
+              <string>3</string>
+              </Note>
+            </Chord>
+          </voice>
         </Measure>
       <Measure>
         <voice>
@@ -36227,11 +35867,9 @@ Transcribed by Joshua Moerman
             </Chord>
           </voice>
         <voice>
-          <Rest>
-            <linked>
-              </linked>
-            <durationType>half</durationType>
-            </Rest>
+          <location>
+            <fractions>1/2</fractions>
+            </location>
           <Chord>
             <linked>
               </linked>
@@ -36304,7 +35942,7 @@ Transcribed by Joshua Moerman
           <Chord>
             <linked>
               </linked>
-            <durationType>16th</durationType>
+            <durationType>eighth</durationType>
             <Articulation>
               <subtype>ornamentMordent</subtype>
               <linked>
@@ -36319,19 +35957,6 @@ Transcribed by Joshua Moerman
               <string>2</string>
               </Note>
             </Chord>
-          <Chord>
-            <linked>
-              </linked>
-            <durationType>16th</durationType>
-            <Note>
-              <linked>
-                </linked>
-              <pitch>55</pitch>
-              <tpc>15</tpc>
-              <fret>0</fret>
-              <string>2</string>
-              </Note>
-            </Chord>
           <Chord>
             <linked>
               </linked>
@@ -37380,7 +37005,7 @@ Transcribed by Joshua Moerman
             </Chord>
           <Chord>
             <linkedMain/>
-            <durationType>eighth</durationType>
+            <durationType>quarter</durationType>
             <Note>
               <linkedMain/>
               <pitch>72</pitch>
@@ -37389,10 +37014,6 @@ Transcribed by Joshua Moerman
               <string>2</string>
               </Note>
             </Chord>
-          <Rest>
-            <linkedMain/>
-            <durationType>eighth</durationType>
-            </Rest>
           <Rest>
             <linkedMain/>
             <durationType>16th</durationType>
@@ -48360,8 +47981,8 @@ Transcribed by Joshua Moerman
               <linkedMain/>
               <pitch>76</pitch>
               <tpc>18</tpc>
-              <fret>0</fret>
-              <string>0</string>
+              <fret>14</fret>
+              <string>3</string>
               </Note>
             </Chord>
           <Chord>
@@ -48371,8 +47992,8 @@ Transcribed by Joshua Moerman
               <linkedMain/>
               <pitch>79</pitch>
               <tpc>15</tpc>
-              <fret>3</fret>
-              <string>0</string>
+              <fret>12</fret>
+              <string>2</string>
               </Note>
             </Chord>
           <Chord>
@@ -48382,8 +48003,8 @@ Transcribed by Joshua Moerman
               <linkedMain/>
               <pitch>83</pitch>
               <tpc>19</tpc>
-              <fret>7</fret>
-              <string>0</string>
+              <fret>12</fret>
+              <string>1</string>
               </Note>
             </Chord>
           <endTuplet/>
@@ -56695,10 +56316,7 @@ Transcribed by Joshua Moerman
           </voice>
         <voice>
           <location>
-            <fractions>1/2</fractions>
-            </location>
-          <location>
-            <fractions>1/16</fractions>
+            <fractions>9/16</fractions>
             </location>
           <Chord>
             <linkedMain/>
@@ -56729,8 +56347,8 @@ Transcribed by Joshua Moerman
               <linkedMain/>
               <pitch>71</pitch>
               <tpc>19</tpc>
-              <fret>0</fret>
-              <string>1</string>
+              <fret>4</fret>
+              <string>2</string>
               </Note>
             </Chord>
           <Chord>
@@ -56769,9 +56387,6 @@ Transcribed by Joshua Moerman
               <string>0</string>
               </Note>
             </Chord>
-          <location>
-            <fractions>1/16</fractions>
-            </location>
           </voice>
         </Measure>
       </Staff>
@@ -57018,7 +56633,7 @@ Transcribed by Joshua Moerman
           <Chord>
             <linked>
               </linked>
-            <durationType>eighth</durationType>
+            <durationType>quarter</durationType>
             <Note>
               <linked>
                 </linked>
@@ -57028,11 +56643,6 @@ Transcribed by Joshua Moerman
               <string>2</string>
               </Note>
             </Chord>
-          <Rest>
-            <linked>
-              </linked>
-            <durationType>eighth</durationType>
-            </Rest>
           <Rest>
             <linked>
               </linked>
@@ -69180,8 +68790,8 @@ Transcribed by Joshua Moerman
                 </linked>
               <pitch>76</pitch>
               <tpc>18</tpc>
-              <fret>0</fret>
-              <string>0</string>
+              <fret>14</fret>
+              <string>3</string>
               </Note>
             </Chord>
           <Chord>
@@ -69193,8 +68803,8 @@ Transcribed by Joshua Moerman
                 </linked>
               <pitch>79</pitch>
               <tpc>15</tpc>
-              <fret>3</fret>
-              <string>0</string>
+              <fret>12</fret>
+              <string>2</string>
               </Note>
             </Chord>
           <Chord>
@@ -69206,8 +68816,8 @@ Transcribed by Joshua Moerman
                 </linked>
               <pitch>83</pitch>
               <tpc>19</tpc>
-              <fret>7</fret>
-              <string>0</string>
+              <fret>12</fret>
+              <string>1</string>
               </Note>
             </Chord>
           <endTuplet/>
@@ -77612,7 +77222,14 @@ Transcribed by Joshua Moerman
             <durationType>16th</durationType>
             <Note>
               <linked>
-                <indexDiff>1</indexDiff>
+                </linked>
+              <pitch>62</pitch>
+              <tpc>16</tpc>
+              <fret>0</fret>
+              <string>3</string>
+              </Note>
+            <Note>
+              <linked>
                 </linked>
               <pitch>74</pitch>
               <tpc>16</tpc>
@@ -77621,7 +77238,6 @@ Transcribed by Joshua Moerman
               </Note>
             <Note>
               <linked>
-                <indexDiff>1</indexDiff>
                 </linked>
               <pitch>77</pitch>
               <tpc>13</tpc>
@@ -77630,22 +77246,12 @@ Transcribed by Joshua Moerman
               </Note>
             <Note>
               <linked>
-                <indexDiff>1</indexDiff>
                 </linked>
               <pitch>83</pitch>
               <tpc>19</tpc>
               <fret>7</fret>
               <string>0</string>
               </Note>
-            <Note>
-              <linked>
-                <indexDiff>-3</indexDiff>
-                </linked>
-              <pitch>62</pitch>
-              <tpc>16</tpc>
-              <fret>0</fret>
-              <string>3</string>
-              </Note>
             <Arpeggio>
               <linked>
                 </linked>
@@ -78217,10 +77823,7 @@ Transcribed by Joshua Moerman
           </voice>
         <voice>
           <location>
-            <fractions>1/2</fractions>
-            </location>
-          <location>
-            <fractions>1/16</fractions>
+            <fractions>9/16</fractions>
             </location>
           <Chord>
             <linked>
@@ -78257,8 +77860,8 @@ Transcribed by Joshua Moerman
                 </linked>
               <pitch>71</pitch>
               <tpc>19</tpc>
-              <fret>0</fret>
-              <string>1</string>
+              <fret>4</fret>
+              <string>2</string>
               </Note>
             </Chord>
           <Chord>
@@ -78303,9 +77906,6 @@ Transcribed by Joshua Moerman
               <string>0</string>
               </Note>
             </Chord>
-          <location>
-            <fractions>1/16</fractions>
-            </location>
           </voice>
         </Measure>
       </Staff>