diff --git a/main.ly b/main.ly
index 636681a..9ebd9c1 100644
--- a/main.ly
+++ b/main.ly
@@ -31,7 +31,9 @@
 
 \score {
   <<
-    \new Staff << \guitar >>
+    \new Staff \with {
+      \consists "Span_arpeggio_engraver"
+    } { \guitar }
   >>
   \layout {}
   \header {
diff --git a/music/2-allegro/guitar.ly b/music/2-allegro/guitar.ly
index e650570..31d7893 100755
--- a/music/2-allegro/guitar.ly
+++ b/music/2-allegro/guitar.ly
@@ -2,8 +2,11 @@
 
 guitarVoiceOne = \relative c {
 
+  \set Staff.connectArpeggios = ##t
+  \voiceOne
+
   % 01
-  \repeat unfold 4 { d8 d16( cis) } |
+  d8\f d16( cis) d8 d16( cis) d8 d16( cis) d8 d16( cis) |
   d2 r4 <d' b> |
   <cis a> <a fis> <g e> <b g> |
   <a fis>2 fis4 r |
@@ -12,29 +15,31 @@ guitarVoiceOne = \relative c {
   a'8 gis-3 g2-2 fis4 |
   e8 fis g2 fis4 |
   e16( dis) fis( e) g( fis) a( g) e8 cis'16( b) a( g) fis( e) |
-  <d fis,>4. <e g,>8 <cis e,>4 r |
+  % fixme
+  <d fis,>4 \grace { e16 d cis d } s8 <e g,>8 <cis e,>4 r |
 
   % 09
-  \repeat unfold 4 { d,8 d16( cis) } |
+  d,8\f d16( cis) d8 d16( cis) d8 d16( cis) d8 d16( cis) |
   d2 r4 <d' b> |
   <cis a> <a fis> <g e> <b g> |
-  <a fis>2 fis4 r |
+  <a fis>2 <fis d>4 r |
 
   % 13
-  a'8 gis-3 g2-2 fis4 |
+  a'8 gis g2 fis4 |
   e8 fis g2 fis4 |
-  e8( e16 dis e8 g) cis,( cis16 b cis8 e) |
-  <d fis,>8 e fis g gis( a) fis d |
+  %% fixme - is the grace note supposed to be a d or a dis?
+  e8( \grace fis8 e16 dis e8 g) cis,( \grace d8 cis16 b cis8 e) |
+  <d fis,>8 e fis g gis\>( a)\! fis d |
 
   % 17
-  e8( e16 dis e8 g) cis,( cis16 b cis8 e) |
+  e8( \grace fis8 e16 dis e8 g) cis,( \grace d8 cis16 b cis8 e) |
   <d fis,>8 e fis g gis( a) fis d |
-  e8( e16 dis e8 g) cis,( cis16 b cis8 e) |
+  e8( \grace fis8 e16 dis e8 g) cis,( \grace d8 cis16 b cis8 e) |
   <d fis,>4 q q r |
 
   % 21
   \repeat unfold 4 { r16 d fis d' } |
-  \repeat unfold 4 { cis4 } |
+  cis4 cis cis\> cis\! |
   \repeat unfold 4 { r16 d, fis d' } |
   \repeat unfold 4 { cis4 } |
 
@@ -51,7 +56,7 @@ guitarVoiceOne = \relative c {
   r8 <d fis, d> q8. q16 r8 <b f d> q8. q16 |
 
   % 33
-  <a e cis a>4 <cis e, cis a> <a e cis a> r |
+  <a e cis a>4\arpeggio <cis e, cis a>\arpeggio <a e cis a> r |
   cis4. b8 a4 a |
   b b b r |
   cis4. cis8 d cis b cis |
@@ -130,13 +135,13 @@ guitarVoiceOne = \relative c {
 
   % 85
   fis8 fis16( e) fis8 a gis e b' gis |
-  <a e cis a>4 <cis e, cis a>4. b8 a gis |
-  fis e d cis <fis d a>4 <gis d b> |
-  <a e cis a>4 <cis e, cis a>4. b8 a gis |
+  <a e cis a>4\arpeggio <cis e, cis a>4. b8 a gis |
+  fis e d cis <fis d a>4\arpeggio\f <gis d b>\arpeggio |
+  <a e cis a>4\arpeggio <cis e, cis a>4.\arpeggio\f b8 a gis |
 
   % 89
-  fis e d cis <fis d a>4 <gis d b> |
-  r8 <a cis,> q4 r8 q q4 |
+  fis e d cis <fis d a>4\arpeggio\f <gis d b>\arpeggio |
+  r8\p <a cis,> q4 r8 q q4 |
   r8 <b d,> q4 r8 q q4 |
   r8 <a cis,> q4 r8 q q4 |
 
@@ -245,6 +250,7 @@ guitarVoiceOne = \relative c {
 
 guitarVoiceTwo = \relative c, {
 
+  \set Staff.connectArpeggios = ##t
   \voiceTwo
 
   % 01
@@ -297,24 +303,24 @@ guitarVoiceTwo = \relative c, {
 
   % 33
   a,4 a a r |
-  a2 s |
-  a2 s |
-  a2 s |
+  a1 |
+  a |
+  a |
 
   % 37
-  a2 s |
+  a |
   <gis' d' e>2 r |
   <a cis e>8 r r4 q8 r r4 |
   <d, fis'>2 r |
 
   % 41
   e2 r |
-  a,2 s |
-  a2 s |
-  a2 s |
+  a,1 |
+  a |
+  a |
 
   % 45
-  a2 s |
+  a |
   <gis' d' e>2 r |
   <a cis e>4 r r2 |
   r4 <dis, b'>4 q q |
@@ -375,12 +381,12 @@ guitarVoiceTwo = \relative c, {
 
   % 85
   \repeat unfold 8 a8 |
-  a4 a4. r8 r4 |
-  s2 d4 e |
-  a,4 a4. r8 r4 |
+  a4\arpeggio a4. r8 r4 |
+  s2 d4\arpeggio e\arpeggio |
+  a,4\arpeggio a4.\arpeggio r8 r4 |
 
   % 89
-  s2 d4 e |
+  s2 d4\arpeggio e\arpeggio |
   a,4. e'8 a,4. e'8 |
   a,4. gis'8 a,4. gis'8 |
   a,4. e'8 a,4. e'8 |
@@ -497,7 +503,7 @@ guitarVoiceThree = \relative c' {
   s1 |
 
   % 13
-  cis8 d e2-4 d4 |
+  cis8 d e2 d4 |
   cis8 d e2 d4 |
   s1 |
   s1 |