diff -r 94bb8bdadcc8 -r 3aa5f7a8e1ac op11/piano/GRegor-op11.ly
--- a/op11/piano/GRegor-op11.ly	Sat Aug 21 14:45:47 2010 -0400
+++ b/op11/piano/GRegor-op11.ly	Sat Aug 21 14:45:56 2010 -0400
@@ -54,12 +54,12 @@
 }
 \score {
 << % common
-    \context GrandStaff = "0" << 
+    \context PianoStaff = "0" << 
+            \set PianoStaff.instrumentName = \markup { \column { "Piano " } }
             % force offset of colliding notes in chords:
             \override Score.NoteColumn #'force-hshift = #1.0
 
-            \context Staff = "track 1, Piano" << 
-                \set Staff.instrumentName = \markup { \column { "Piano " } }
+            \context Staff = "RH" << 
                 \set Staff.midiInstrument = "Acoustic Grand Piano"
                 \set Score.skipBars = ##t
                 \set Staff.printKeyCancellation = ##f
@@ -114,12 +114,12 @@
                     aes' 2. _~ aes' 4. g'  |
                     aes' 2. _~ aes' 4. g'  |
                     aes' 4. bes' g' aes'  |
-                    bes' 4. aes' 2. _~ aes' 4.  |
+                    bes' 4. aes' 2. ^~ aes' 4.  |
                     c'' 2. _~ c'' 4. aes'  |
 %% 35
                     c'' 2. _~ c'' 4. bes'  |
                     c'' 4. f'' g'' aes''  |
-                    g'' 4. f'' 2. _~ f'' 4.  |
+                    g'' 4. f'' 2. ^~ f'' 4.  |
                     c'' 2. _~ c'' 4. aes'  |
                     c'' 2. _~ c'' 4. bes'  |
 %% 40
@@ -244,7 +244,7 @@
                     aes' 2. _~ aes' 4. g' 8. aes'  |
 %% 90
                     bes' 4. aes' g' aes'  |
-                    bes' 4. aes' 2. _~ aes' 4.  |
+                    bes' 4. aes' 2. ^~ aes' 4.  |
                     aes' 2. _~ aes' 4. g'  |
                     aes' 2. _~ aes' 4. g' 8. aes'  |
                     bes' 4. aes' g' aes'  |
@@ -482,11 +482,11 @@
                     < aes' c'' > 2. _~ < aes' c'' > 4. < c'' e'' >  |
                     < bes' f'' > 4. g'' e'' f''  |
 %% 200
-                    < g'' d'' > 4. < c'' f'' > 2. _~ < c'' f'' > 4.  |
+                    < g'' d'' > 4. < c'' f'' > 2. ^~ < c'' f'' > 4.  |
                     < aes' f' > 2. _~ < aes' f' > 4. < bes' g' >  |
                     < c'' aes' > 2. _~ < c'' aes' > 4. < e'' c'' >  |
                     < f'' bes' > 4. g'' e'' f''  |
-                    < g'' bes' > 4. < aes' f'' > 2. _~ < aes' f'' > 4.  |
+                    < g'' bes' > 4. < aes' f'' > 2. ^~ < aes' f'' > 4.  |
 %% 205
                     < g'' bes' > 4. -\ff < f'' aes' > 2. _~ < f'' aes' > 4.  |
                     < bes' g'' > 4 aes'' < f'' aes' > 1  |
@@ -568,8 +568,7 @@
                 } % Voice
             >> % Staff ends
 
-            \context Staff = "track 2,  " << 
-                \set Staff.instrumentName = \markup { \column { "  " } }
+            \context Staff = "LH" << 
                 \set Staff.midiInstrument = "Acoustic Grand Piano"
                 \set Score.skipBars = ##t
                 \set Staff.printKeyCancellation = ##f
@@ -617,17 +616,29 @@
                     f, 8 c f aes c' f' f' c' aes f c f,  |
                     e, 8 c e aes c' e' e' c' aes e c e,  |
                     ees, 8 c ees aes c' ees' r ees' c' aes ees ees,  |
-                    d, 8 c d aes c' f' c'' f' c' aes d d,  |
+                    d, 8 c d aes c'
+                    \change Staff = "RH"
+                    f' c'' f'
+                    \change Staff = "LH"
+                    c' aes d d,  |
 %% 30
                     f, 8 c f aes c' f' f' c' aes f c f,  |
                     e, 8 c e aes c' e' e' c' aes e c e,  |
                     ees, 8 c ees aes c' ees' r ees' c' aes ees ees,  |
-                    d, 8 c d aes c' f' c'' f' c' aes d d,  |
+                    d, 8 c d aes c'
+                    \change Staff = "RH"
+                    f' c'' f'
+                    \change Staff = "LH"
+                    c' aes d d,  |
                     f, 8 c f aes c' f' f' c' aes f c f,  |
 %% 35
                     e, 8 c e aes c' e' e' c' aes e c e,  |
                     ees, 8 c ees aes c' ees' aes' ees' c' aes ees ees,  |
-                    d, 8 c d aes c' f' c'' f' c' aes d d,  |
+                    d, 8 c d aes c'
+                    \change Staff = "RH"
+                    f' c'' f'
+                    \change Staff = "LH"
+                    c' aes d d,  |
                     f, 8 c f aes c' f' f' c' aes f c f,  |
                     e, 8 c e aes c' e' e' c' aes e c e,  |
 %% 40
@@ -716,12 +727,20 @@
                     e, 8 c e aes c' e' e' c' aes e c e,  |
 %% 90
                     ees, 8 c ees aes c' ees' r ees' c' aes ees ees,  |
-                    d, 8 c d aes c' f' c'' f' c' aes d d,  |
+                    d, 8 c d aes c'
+                    \change Staff = "RH"
+                    f' c'' f'
+                    \change Staff = "LH"
+                    c' aes d d,  |
                     f, 8 c f aes c' f' f' c' aes f c f,  |
                     e, 8 c e aes c' e' e' c' aes e c e,  |
                     ees, 8 c ees aes c' ees' r ees' c' aes ees ees,  |
 %% 95
-                    d, 8 c d aes c' f' c'' f' c' aes d d,  |
+                    d, 8 c d aes c'
+                    \change Staff = "RH"
+                    f' c'' f'
+                    \change Staff = "LH"
+                    c' aes d d,  |
                     f, 8 c f r4. r f 8 c f,  |
                     e, 8 c e r4. r e 8 c e,  |
                     ees, 8 c ees r4. r2.  |
@@ -952,28 +971,56 @@
                     e, 8 c e aes c' e' e' c' aes e c e,  |
 %% 195
                     ees, 8 c ees aes c' ees' r ees' c' aes ees ees,  |
-                    d, 8 c d aes c' f' c'' f' c' aes d d,  |
+                    d, 8 c d aes c'
+                    \change Staff = "RH"
+                    f' c'' f'
+                    \change Staff = "LH"
+                    c' aes d d,  |
                     f, 8 c f aes c' f' f' c' aes f c f,  |
                     e, 8 c e aes c' e' e' c' aes e c e,  |
                     ees, 8 c ees aes c' ees' aes' ees' c' aes ees ees,  |
 %% 200
-                    d, 8 c d aes c' f' c'' f' c' aes d d,  |
+                    d, 8 c d aes c'
+                    \change Staff = "RH"
+                    f' c'' f'
+                    \change Staff = "LH"
+                    c' aes d d,  |
                     f, 8 c f aes c' f' f' c' aes f c f,  |
                     e, 8 c e aes c' e' e' c' aes e c e,  |
                     ees, 8 c ees aes c' ees' aes' ees' c' aes ees ees,  |
-                    d, 8 c d aes c' f' c'' f' c' aes d d,  |
+                    d, 8 c d aes c'
+                    \change Staff = "RH"
+                    f' c'' f'
+                    \change Staff = "LH"
+                    c' aes d d,  |
 %% 205
                     des, 8 aes, des aes c' f' f' c' aes des aes, des,  |
                     d, 8 aes, d aes c' f' f' c' aes d aes, d,  |
-                    ees, 8 aes, ees aes c' aes' aes' c' aes ees aes, ees,  |
-                    e, 8 aes, e aes aes' e'' e'' aes' e' aes e aes,  |
+                    ees, 8 aes, ees aes
+                    \change Staff = "RH"
+                    c' aes' aes' c'
+                    \change Staff = "LH"
+                    aes ees aes, ees,  |
+                    e, 8 aes, e aes
+                    \change Staff = "RH"
+                    aes' e'' e'' aes' e'
+                    \change Staff = "LH"
+                    aes e aes,  |
                     f, 8 c f aes c' f' f' c' aes f c f,  |
 %% 210
                     ges, 8 c ges aes c' ges' r ges' c' aes ges ges,  |
                     des, 8 aes, des aes c' f' f' c' aes des aes, des,  |
                     d, 8 aes, d aes c' f' f' c' aes d aes, d,  |
-                    ees, 8 aes, ees aes c' aes' aes' c' aes ees aes, ees,  |
-                    e, 8 aes, e aes e' aes' aes' e' aes e aes, e,  |
+                    ees, 8 aes, ees aes
+                    \change Staff = "RH"
+                    c' aes' aes' c'
+                    \change Staff = "LH"
+                    aes ees aes, ees,  |
+                    e, 8 aes, e aes
+                    \change Staff = "RH"
+                    e' aes' aes' e'
+                    \change Staff = "LH"
+                    aes e aes, e,  |
 %% 215
                     f, 8 c f aes c' f' f' c' aes f c f,  |
                     ges, 8 c ges aes c' ges' r ges' c' aes ges ges,  |
