diff --git a/amazing-grace.ly b/amazing-grace.ly
index d1043eb..9582552 100644
--- a/amazing-grace.ly
+++ b/amazing-grace.ly
@@ -1,8 +1,9 @@
-\version "2.14.2"
+\version "2.18.0"
 \language "english"
 
 \header {
   title = "Amazing Grace"
+  subsubtitle = "For Dave and Avery Quatro"
   composer = "Traditional"
   arranger = "Tommy Montgomery"
   copyright = "(c) 2004 Tommy Montgomery"
@@ -42,7 +43,7 @@ introR = \relative c {
   \change Staff = "left" \override Stem #'direction = #UP <f, af df>4 \revert Stem #'direction \change Staff = "right" <f' af df> <f' af df>2 |
   \times 2/3 { <gf,, bf df gf>4\arpeggio <f f'> <ef ef'> } \times 2/3 { <ef gf bf ef>\arpeggio <f f'> <gf gf'> } |
   
-  <fs a d fs>2 \change Staff = "left" d32 fs a \change Staff = "right" d d fs a d \times 4/7 { d16 fs a \ottava #'1 d d fs a } |
+  <fs a d fs>2 d32 fs a d d fs a d \times 4/7 { d16 fs a \ottava #'1 d d fs a } |
   <d, d'>1\fermata \bar "||" |
   
   \time 12/8
@@ -52,7 +53,7 @@ introR = \relative c {
   \ottava #'0 <a, d a'>4. <a d g> <a d fs> <a d g> |
   <a d a'> <a d g> <a d fs> <a d g> |
   <bf d a'> <bf d g> <bf d f> <bf e> |
-  <a f'> <a e'> <a d> <a cs> \cadenzaOn s2 s16 s s \cadenzaOff \bar "|" |
+  <a f'> <a e'> <a d> <a cs> \noBreak \bar "" \cadenzaOn s2 s4 \cadenzaOff \bar "|" |
   
   \time 3/4
   \repeat unfold 4 r2. 
@@ -79,7 +80,8 @@ introL = \relative c,, {
   d''8 a' d ~ d e fs ~ fs e d ~ d a d, |
   c g' c ~ c d e ~ e d c ~ c g c, |
   bf f' bf ~ bf c d ~ d c bf ~ bf f bf, |
-  a e' a ~ a bf cs ~ \times 3/5 { cs d e f g } \cadenzaOn \parenthesize a4. \teeny e16[ cs bf a e cs bf a g f e] \normalsize \cadenzaOff \bar "|" |
+  a e' a ~ a bf cs ~ \times 3/5 { cs d e f g } 
+  \parenthesize a4. ~ \teeny a16[ e cs bf a e cs bf a g f e] \normalsize \cadenzaOff \bar "|" |
   
   \time 3/4
   \tempo 4 = 76
@@ -408,7 +410,7 @@ outroR = \relative c {
   \change Staff = "left" \override Stem #'direction = #UP <f, af df>4 \revert Stem #'direction \change Staff = "right" <f' af df> <f' af df>2 |
   \times 2/3 { <gf, bf df gf>4\arpeggio <f f'> <ef ef'> } \times 2/3 { <ef gf bf ef>\arpeggio <f f'> <gf gf'> } |
   
-  <fs a d fs>2 \change Staff = "left" d,32 fs a \change Staff = "right" d d fs a d \times 4/7 { d16 fs a \ottava #'1 d d fs a } |
+  <fs a d fs>2 d,32 fs a d d fs a d \times 4/7 { d16 fs a \ottava #'1 d d fs a } |
   <d, d'>1\fermata \bar "||" |
   
   \key c \major
diff --git a/amazing-grace.pdf b/amazing-grace.pdf
index 615af6e..49bad58 100644
Binary files a/amazing-grace.pdf and b/amazing-grace.pdf differ