diff --git a/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-1-praeludium.ly b/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-1-praeludium.ly
index a3ef3904..5ee51344 100644
--- a/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-1-praeludium.ly
+++ b/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-1-praeludium.ly
@@ -10,21 +10,22 @@ staffUpper = { \change Staff = "upper" }
 
 Soprano = \context Voice = "one" \relative c'' {
   \voiceOne
-  \stemUp
+  \stemNeutral
   \showStaffSwitch
   %1
   | r16 bes[ bes32 \prall a bes16] c bes d bes es[ bes bes32 \prall a bes16] d bes es bes
   | f'[ bes, bes32 \prall a bes16] g' bes, a' bes, bes'[ a32 g f16 bes] c,32[ d es8 d32 c]
   | d32[ c bes8 g32 a] bes[ c d8 c32 bes] c[ bes a8 f32 g] a[ bes c8 bes32 a]
-  | bes[ a g8 a32 bes] c[ d e f g16 bes,]~ bes8 a bes c
+  | bes[ a g8 a32 bes] c[ d e f g16 bes,]~ \stemUp bes8^\prall a bes c
   %5
   | d c16 bes c8 d es d16 e f8 g~
   | g f4 e8 f2~
   | f8 f d bes es g c4~
   | c8 f, bes4~ bes8 a16 g a fis g8
   | fis fis g a bes, g' a bes
+    \break
   %10
-  | c, es d c bes32[ c d8 c32 bes] a[ bes c8 bes32 a]
+  | c, ees! d c bes32[ c d8 c32 bes] a[ bes c8 bes32 a]
   | bes16[ d d32^\prall c d16] bes'4~ bes8 a~ a16 g8 f16
   | e[ c c32 \prall b c16] d c e c f[ c c32 \prall b c16] e c f c
   | g'32[ f e8 d32 c] bes'[ a g8 f32 e] c'[ e, f g f e f d] e8. \prall f16
@@ -33,7 +34,7 @@ Soprano = \context Voice = "one" \relative c'' {
   | g[ f es8 d32 es] f[ g a bes c16 es,] f32[ es d8 c32 d] es[ f g a bes16 d,]
   | es32[ d c8 d32 es] d[ c bes a bes a g f] \stemUp d'4~ d8. c16
   | bes16 a g'8 f es d bes' a g
-  | f es d c d32[ c bes16 es32 d c16] bes8 a16. \prall bes32
+  | f ees! d c d32[ c bes16 es32 d c16] bes8 a16. \prall bes32
   | bes16[ bes bes32 \prall a bes16] c bes d bes es[ bes bes32 \prall a bes16] d bes es bes
   %20
   | f'[ bes, bes32 \prall a bes16] g' bes, a' bes, bes'[ a32 g f16 bes] g bes f a
@@ -46,27 +47,32 @@ Alto = \context Voice = "two" \relative c' {
   \stemDown
   \override Rest.staff-position = #0
   \override VoiceFollower.color = \grayTextColor
-  \showStaffSwitch
+  \showStaffSwitch\tieUp
   %1
-  | d4 es8 f g4 f8 es
-  | d4 es8 c d \staffLower\stemUp bes4 a8
-  | bes \hideStaffSwitch \staffUpper\stemDown d g4~ g8 c, f4~ \showStaffSwitch
-  | f8 e16 d e4 f2~
+  | \staffLower\stemUp
+    d4 es8 f g4 f8 es
+  | d4 ees8[ c] d \clef bass bes4 a8
+  | bes8 \clef treble d g4~ g8 c, f4~
+  | f8 e16 d e4 \staffUpper\stemDown\tieDown f2~
   %5
   | f2 a8 bes4.
   | a4 bes8 g a\rest c a f
   | bes2~ bes4 d8\rest es
   | d4 d8\rest d8 c4~ c8. bes16
-  | a16[ d, d32\prall cis d16] e d fis d g[ d d32\prall cis d16] fis d g d
+  | \hideStaffSwitch a16[ \staffLower\stemUp d, d32^\prall cis d16] e d fis \showStaffSwitch d
+    \clef bass \staffUpper\stemDown
+    g[ \hideStaffSwitch \staffLower\stemUp \clef treble d d32^\prall cis d16] fis d g \showStaffSwitch d
   %10
-  | a'8 c bes a~ a g~ g fis
+  | \staffUpper\stemDown a'8 c bes a~ a g~ g fis
   | g g \rest d'16 \rest d[ d32\prall c d16] g16 c,8 c16 d8 bes~
-  | bes e, f g a f g a
-  | bes e, f g a4 g
-  | a8\hideStaffSwitch \staffLower\stemUp\tieUp c, a f bes2~ \showStaffSwitch
+  | \hideStaffSwitch bes \staffLower\stemUp \clef treble e, f \showStaffSwitch g
+    \clef bass \staffUpper\stemDown a \hideStaffSwitch \staffLower\stemUp \clef treble f g a \showStaffSwitch
+  | \staffUpper\stemDown bes \hideStaffSwitch \staffLower\stemUp e, f g a4
+    \showStaffSwitch \staffUpper\stemDown g
+  | a8 \hideStaffSwitch \staffLower\stemUp\tieUp c, a f bes2~
   %15
   | bes8 g c4~ c8 f, bes4~
-  | bes8 a16 g a4 \staffUpper\stemDown\tieDown es'32 \rest f[ g a bes16 f] g d es8~
+  | bes8 a16 g \showStaffSwitch a4 \staffUpper\stemDown\tieDown es'32 \rest f[ g a bes16 f] g d es8~
   | es es' d c bes d c bes
   | a c bes4~ bes8 c, d es
   | d d es f f \rest es d c
@@ -93,21 +99,22 @@ Bass = \context Voice = "four" \relative c' {
   \override MultiMeasureRest.staff-position = #0
   \override Rest.staff-position = #0
   %1
-  | bes1~
-  | bes2~ bes8 d, es f
-  | bes, r r bes' a4 r8 d
-  | g,4 r8 c r16 \stemNeutral f,[ f32^\prall e f16] g f a f
+  | \clef treble
+    bes1~
+  | bes2~ bes8 \clef bass d, es f
+  | bes, \clef treble g'\rest b\rest bes a4 b8\rest d
+  | g,4 a8\rest c r16 \stemNeutral \clef bass f,[ f32^\prall e f16] g f a f
   %5
   | bes[ f f32^\prall e f16] a f bes f c'[ f, f32^\prall e f16] d' f, e' f,
-  | f'[ e32 d c16 f] g,32[ a bes8 a32 g] a[ g f8 a32 bes] c[ d es8 d32 c]
-  | d[ c bes8 d32 es] \clef "G" f[ g aes8 g32 f] g[ f es8 d32 es] f[ g a bes c16 es,]
+  | f'[ e32 d c16 f] g,32[ a bes8 a32 g] a[ g f8 a32 bes] \clef treble c[ d es8 d32 c]
+  | d[ c bes8 d32 es] f[ g aes8 g32 f] g[ f es8 d32 es] f[ g a bes c16 es,]
   | f32[ es d8 c32 d] es[ f g a bes16 d,] es32[ d c16_~ c32 bes a bes] c[ d es d c bes a g]
-  | d'16 r r8 r4 \clef "bass" d,8 r r4
+  | \stemDown d'16 g,\rest g8\rest g4\rest \clef bass d8 g\rest g4\rest
   %10
-  | r16 d d32^\prall cis d16 e d fis d g8 bes, c d
+  | \clef bass \stemNeutral r16 d d32^\prall cis d16 e d fis d g8 bes, c d
   | g, g'4 f8 e f bes, g
-  | c r r4 c8 r r4
-  | r8 c' d e f bes, c c,
+  | \stemDown c a'\rest a4\rest c,8 a'\rest a4\rest
+  | r8 c d e f[ bes,] \clef bass c c,
   | f, c'\rest c4\rest c8\rest f d bes
   %15
   | es4 r8 es d4 r8 g