diff --git a/broken-tranquility.ly b/broken-tranquility.ly
index 87d4338..0f98067 100644
--- a/broken-tranquility.ly
+++ b/broken-tranquility.ly
@@ -12,20 +12,44 @@ lhBrokenChord = {
     fs,8 cs' fs a cs fs a fs cs a fs cs | 
   }
 }
+brokenMinorTenth = {
+  \relative c, {
+    cs8 gs' cs e cs gs cs, gs' cs e cs gs |
+  }
+}
+brokenMajorTenth = {
+  \relative c, {
+    cs8 gs' cs es cs gs cs, gs' cs es cs gs |
+  }
+}
+
+bachFugue = {
+  \relative c'' {
+    g16 g' f g ef g d g c, g' d g ef g g, g' a, g' b, g' c, g' b, g' c, g' d g |
+  }
+}
+bachFugueL = {
+  \relative c {
+    << { r8 \clef treble af''8 g f ef f g b, c d ef d ef f } \\ { \clef bass <c,,, c'>1 s2. } >> |
+  }
+}
 
 sixBeamException = {
   \set Timing.beatStructure = #'(6 6)
 }
 
+defaults = {
+  \set Staff.printKeyCancellation = ##f
+  \numericTimeSignature
+}
+
 \parallelMusic #'(right left) {
-  
-  \key fs \dorian
   \time 4/4
   \tempo "Moderately" 4 = 120
   \set Score.connectArpeggios = ##t
   
-  \key fs \dorian <b e>4.    b8 e  fs gs e   |
-  \key fs \dorian e,8  b' e4    a8 b4    cs8 |
+  \defaults \key fs \dorian <b e>4.    b8 e  fs gs e   |
+  \defaults \key fs \dorian e,8  b' e4    a8 b4    cs8 |
   <fs a>4. <e gs> <ds fs>4 |
   a,8 e' a4  <cs,, cs'>8 <fs' a> ~ <fs a>4 |
   <es gs>2.\fermata ds8 es |
@@ -36,9 +60,9 @@ sixBeamException = {
   
   << { a'2 ~ a8 fs' gs a } \\ { <a,, ds>2 ~ <a ds>8 fs' gs a } >> |
   << { r8 cs' fs a ds a fs cs } \\ { <fs,, fs'>1 } >> |
-  << { b'2. ds4 } \\ { <b, es>2. ds4 } >> |
+  << { b'2.\arpeggio ds4 } \\ { <b, es>2.\arpeggio ds4 } >> |
   << { r8 b' ds es b' es, ds b } \\ { <es,, es'>1 } >> |
-  << { cs'2 gs2\fermata } \\ { <cs, es>1 } >> |
+  << { cs'2\arpeggio gs2\fermata } \\ { <cs, es>1\arpeggio } >> |
   <cs cs'>8 <gs'' gs'> <ds' ds'> <b b'> <es cs'>2\fermata |
   
   \time 12/8
@@ -65,12 +89,12 @@ sixBeamException = {
   
   % and it begins...
   
-  <fs, cs' fs>2. ~ <fs cs' fs>4. ~ <fs cs' fs>4 <cs' fs cs'>8 |
+  <fs, cs' fs>2.\arpeggio ~ <fs cs' fs>4. ~ <fs cs' fs>4 <cs' fs cs'>8 |
   \lhBrokenChord |
   <cs fs cs'>4 <cs fs cs'>8 <ds ds'>4 <cs cs'>8 <cs fs cs'>2. |
   \lhBrokenChord |
   
-  <bs fs' bs>2. ~ <bs fs' bs>4. <gs gs'> |
+  <bs fs' bs>2.\arpeggio ~ <bs fs' bs>4. <gs gs'> |
   gs,,8 ds' fs bs ds fs bs fs ds bs fs ds |
   <b? es b'?>1. |
   cs8 gs' cs es gs cs es cs gs es cs gs |
@@ -82,7 +106,7 @@ sixBeamException = {
   <fs cs' fs>1. |
   \lhBrokenChord |
   r1. |
-  fs,8 cs' fs a cs e? d cs b a gs fs |
+  fs,8 cs' fs a cs e? ds cs b a gs fs |
   \time 6/8
   r2. |
   es8 d cs b a gs |
@@ -100,36 +124,43 @@ sixBeamException = {
   g,8 df' g bf df e g e df bf g df |
   <f af c f>1. |
   f,8 c' f g af c f c af g f c |
-  <es gs cs es>1.\arpeggio |
+  <es gs cs es>1. |
   es,8 gs cs es gs cs es cs gs es cs gs |
   <fs a cs fs>1.\arpeggio |
   \lhBrokenChord |
   r1. |
   \lhBrokenChord |
   
-  \set Timing.beatStructure = #'(3 3 3 3)
   
-  r2. <a fs'>8( <gs e'> <fs ds'>) <fs ds'>( <gs e'> <fs ds'>) |
-  <fs fs'>2. <fs fs'>8 <gs gs'> <gs gs'> <a a'> <b b'> <b b'> |
+  \time 9/8
+  r4. <a fs'>8( <gs e'> <fs ds'>) <fs ds'>( <gs e'> <fs ds'>) |
+  fs4. <fs fs'>8 <gs gs'> <gs gs'> <a a'> <b b'> <b b'> |
   
+  \time 12/8
   << { <es cs'>2. s2. } \\ { s2. \grace { es,16[ gs cs es gs cs gs' cs] } gs'2. } >> |
   <cs cs'>2. ~ <cs cs'>4. <a a'>8 <gs gs'> <a a'> |
   
-  r2. <cs,, a'>8( <b gs'> <a fs'>) <a fs'>( <b gs'> <a fs'>) |
-  <fs fs'>2. <fs fs'>8 <gs gs'> <gs gs'> <a a'> <b b'> <b b'> |
+  \time 9/8
+  r4. <cs,, a'>8( <b gs'> <a fs'>) <a fs'>( <b gs'> <a fs'>) |
+  <fs fs'>4. <fs fs'>8 <gs gs'> <gs gs'> <a a'> <b b'> <b b'> |
   
+  \time 12/8
   << { <gs es'>2. s2. } \\ { s2. \grace { es,16[ gs cs es gs cs gs' cs] } gs'2. } >> |
   <cs cs'>2. ~ <cs cs'>4. <b b'>8 <a a'> <b b'> |
   
-  r2. <d, b'>8( <cs a'> <b gs'>) <b gs'>( <cs a'> <b gs'>) |
-  <gs gs'>2. <gs gs'>8 <a a'> <b b'> <b b'> <cs cs'> <cs cs'> |
+  \time 9/8
+  r4. <d, b'>8( <cs a'> <b gs'>) <b gs'>( <cs a'> <b gs'>) |
+  <gs gs'>4. <gs gs'>8 <a a'> <b b'> <b b'> <cs cs'> <cs cs'> |
   
+  \time 12/8
   << { <a fs'>2. s2. } \\ { s2. \grace { fs,16[ a d fs a d a' d] } a'2. } >> |
   <d d'>2. ~ <d d'>4. <d d'>8 <cs cs'> <d d'> |
   
-  r2. <f, d'>8( <e cs'> <d b'>) <d b'>( <e cs'> <d b'>) |
-  <b b'>2. <d d'>8 <e e'> <f f'> <gs gs'> <a a'> <gs gs'> |
+  \time 9/8
+  r4. <f, d'>8 <e cs'> <d b'> <d b'> <e cs'> <d b'> |
+  <b b'>4. <d d'>8 <e e'> <f f'> <gs gs'> <a a'> <gs gs'> |
   
+  \time 12/8
   <cs a'>1. |
   <a a'>1. |
   
@@ -152,7 +183,224 @@ sixBeamException = {
   fs1. |
   fs,8 a cs fs cs a fs a cs fs cs a |
   r1. |
-  fs8 a cs fs cs fs a fs cs fs cs a |
+  fs8 a cs fs cs fs a fs cs a cs fs |
+  
+  fs1. |
+  cs8 fs a cs a fs cs fs a cs a fs |
+  <cs' cs'>4 <cs cs'>8 <ds ds'>4 <cs cs'>8 <cs cs'>2. |
+  cs8 fs a ds a fs cs fs a ds a fs |
+  <b b'>2. <b b'>4 <a a'> <g g'> |
+  d8 fs g b g fs d fs g b g fs |
+  <bf bf'>2. <bf bf'>4 <af af'> <g g'> |
+  df8 e g bf g e df e g bf g e |
+  <f f'>1. |
+  c8 f af c af f c f af c af f |
+  es1. |
+  cs?8 es gs cs? gs es cs es gs cs gs es |
+  fs1. ~ |
+  cs8 fs a cs a fs cs fs a cs a fs |
+  
+  \tempo "Slower" 4. = 120
+  \set Timing.beatStructure = #'(3 3 3 3)
+  fs2. <cs cs'>8 <b b'> <a a'> <b b'> <a a'> <gs gs'> |
+  cs2.       <cs, cs'>8 <b b'> <a a'> <b b'> <a a'> <gs gs'> |
+  
+  \time 9/8
+  <fs fs'>4. <a' fs' a>8 <gs e' gs> <fs ds' fs> <fs ds' fs> <gs e' gs> <fs ds' fs> |
+  <fs fs'>4. <fs fs'>8 <gs gs'> <gs gs'> <a a'> <b b'> <b b'> |
+  
+  \time 12/8
+  <es cs' es>2. \grace { es,16[ gs cs es gs cs gs' cs] } gs'4. <a,,, a'>8 <gs gs'> <a a'> |
+  <cs cs'>2. ~ <cs cs'>4. <a a'>8 <gs gs'> <a a'> |
+  
+  \time 9/8
+  <fs fs'>4. <cs'' a' cs>8 <b gs' b> <a fs' a> <a fs' a> <b gs' b> <a fs' a> |
+  <fs fs'>4. <fs fs'>8 <gs gs'> <gs gs'> <a a'> <b b'> <b b'> |
+  
+  \time 12/8
+  <gs es' gs>2. \grace { es,16[ gs cs es gs cs gs' cs] } gs'4. <b,,, b'>8 <a a'> <b b'> |
+  <cs cs'>2. ~ <cs cs'>4. <b b'>8 <a a'> <b b'> |
+  
+  \time 9/8
+  <gs gs'>4. <d'' b' d>8 <cs a' cs> <b gs' b> <b gs' b> <cs a' cs> <b gs' b> |
+  <gs gs'>4. <gs gs'>8 <a a'> <b b'> <b b'> <cs cs'> <cs cs'> |
+  
+  \time 12/8
+  <a fs' a>2. \grace { fs,16[ a d fs a d a' d] } a'4. <d,,, d'>8 <cs cs'> <d d'> |
+  <d d'>2. ~ <d d'>4. <d d'>8 <cs cs'> <d d'> |
+  
+  \time 9/8
+  <b b'>4. <f'' d' f>8 <e cs' e> <d b' d> <d b' d> <e cs' e> <d b' d> |
+  <b b'>4. <d d'>8 <e e'> <f f'> <gs gs'> <a a'> <gs gs'> |
+  
+  \time 12/8
+  \sixBeamException
+  
+  << { s2. g,4.\arpeggio ~ g8( fs e) } \\ { <cs' a' cs>2. <a, cs>2.\arpeggio } >> |
+  <a a'>2. <a e' g>2.\arpeggio |
+  
+  \tempo "Faster" 4. = 144
+  fs'1. |
+  d8 fs a e' a, fs d fs a e' a, fs |
+  cs'4 cs8 d4 cs8 cs2. |
+  d8 fs e' fs e fs, d fs e' fs e fs, |
+  b2. ~ b4. gs |
+  cs8 fs b cs b fs cs fs b cs b fs |
+  b1. |
+  b,8 e fs a fs e b e fs a fs e |
+  a1. |
+  a,8 ds fs a fs ds a ds fs a fs ds |
+  a4 gs fs e fs g |
+  gs,8 ds' fs bs fs ds as e' g as g e |
+  fs1. ~ |
+  cs8 fs b cs b fs cs fs b cs b fs |
+  fs2. ~ fs4. \grace { e16[ fs] } g8 fs e |
+  cs8 fs as cs as fs cs fs as cs as fs |
+  
+  fs1. |
+  d8 fs a e' a, fs d fs a e' a, fs |
+  <cs' a' cs>4 <cs a' cs>8 <d b' d>4 <cs a' cs>8 <cs a' cs>2. |
+  d8 fs e' fs e fs, d fs e' fs e fs, |
+  <b e b'>2.\arpeggio <b e b'>4 <a a'> <gs gs'> |
+  e8 a b e b a e a b d b a |
+  <b ds b'>2.\arpeggio <b ds b'>4 <a a'> <gs gs'> |
+  f8 a b ds? b a f a b ds b a |
+  <fs fs'>1. |
+  fs8 b cs fs cs b fs b cs fs cs b |
+  <g b cs e>1.\arpeggio |
+  g8 b cs e cs b g b cs e cs b |
+  <b cs~ fs~>1.\arpeggio |
+  fs8 b cs fs cs b fs b cs fs cs b |
+  <as cs fs>2. fs8 gs as b cs ds |
+  fs8 as cs fs cs as fs4. <e, e'>4 <ds ds'>8 |
+  
+  <e, cs' e>2. ~ <e cs' e>4. <a? e' a?> |
+  \brokenMinorTenth |
+  <gs e' gs>2. ~ <gs e' gs>4. <e gs e'> |
+  \transpose cs e \brokenMajorTenth |
+  <fs b fs'>2. <fs b fs'>4 <e e'> <ds fs ds'> |
+  \transpose cs b, \brokenMajorTenth |
+  <cs es cs'>2. cs16[ ds es fs gs a] b cs ds es fs gs |
+  cs8 gs' cs es cs gs cs,2. |
+  
+  <a, fs' a>2. ~ <a fs' a>4. <d fs d'> |
+  \transpose cs fs \brokenMinorTenth |
+  <cs fs cs'>2. ~ <cs fs cs'>4. <a cs a'> |
+  \transpose cs a \brokenMajorTenth |
+  <b e b'>2. <b e b'>4 <a a'> <gs b gs'> |
+  \transpose cs e \brokenMajorTenth |
+  <fs a fs'>1. |
+  \transpose cs fs \brokenMinorTenth |
+  
+  fs,8 gs a b cs d cs b a gs fs e |
+  fs8 e fs gs a b a gs fs e d cs |
+  fs4. <fs' a cs fs> <gs cs es gs> <a cs fs a> |
+  fs4. <fs, fs'> <cs' cs'> <d d'> |
+  <gs cs es gs>1. |
+  <es es'>4. <cs cs'>8 <gs gs'> <es es'> <cs cs'>2. |
+  fs,8 gs a b cs d cs b a gs fs e |
+  fs'8 e fs gs a b a gs fs e d cs |
+  fs4. <b' d fs b> <cs e g cs> <d fs b d> |
+  fs4. <b, b'> <e e'> <g g'> |
+  <cs fs as cs>1. |
+  <as as'>4. <g g'>8 <e e'> <cs cs'> <as as'>2. |
+  
+  b,8 cs d e fs g fs e d cs b a |
+  b'8 a b cs d e d cs b a g fs |
+  b4. <b' d fs b> <cs fs as cs> <d fs b d> |
+  b4. <b, b'> <fs' fs'> <g g'> |
+  <cs fs as cs>1. |
+  <as as'>4. <fs fs'>8 <cs cs'> <as as'> <fs fs'>2. |
+  b,8 cs d e fs g fs e d cs b a |
+  b'8 a b cs d e d cs b a g fs |
+  b4. <fs' b d fs> <g cs e g>  <e g b e> |
+  b4. <b, b'> <e e'> <g g'> |
+  <e fs as cs>1. |
+  <as as'>4. <fs fs'>8 <e e'> <cs cs'> <as as'>2. |
+  
+  b1. |
+  r8 b' d fs d b fs b d fs d b |
+  fs'4 fs8 gs4 fs8 fs2. |
+  fs8 b d gs d b fs b d gs d b |
+  es2. ~ es4. cs |
+  es,8 b' cs es cs b es, b' cs es cs b |
+  e?1. |
+  e,?8 fs as e'? as, fs e fs as e' as, fs |
+  <as, d>1. |
+  d8 fs as d as fs d fs as d as fs |
+  << { d4 cs b as b cs } \\ { fs,2. g2. } >> |
+  cs8 fs as cs as fs cs fs as cs as fs |
+  <fs b>1. |
+  b,8 d fs b fs d b d fs b fs d |
+  r1. |
+  b8 d fs b fs b d b fs d fs b |
+  
+  b1. |
+  fs8 b d fs d b fs b d fs d b |
+  <fs' fs'>4 <fs fs'>8 <gs gs'>4 <fs fs'>8 <fs fs'>2. |
+  fs8 b d gs d b fs b d gs d b |
+  <e e'>2. <e e'>4 <d d'> <c c'> |
+  g8 b c e c b g b c e c b |
+  <ef ef'>2. <ef ef'>4 <df df'> <c c'> |
+  gf8 a c ef c a gf a c ef c a |
+  <bf bf'>1. |
+  f8 bf df f df bf f bf df f df bf |
+  <bf bf'>1. |
+  gf8 bf df gf df bf gf bf df gf df bf |
+  <c ef af c>1.\arpeggio |
+  af8 c ef af ef c af c ef af ef c |
+  
+  \key c \minor <bf bf'>2. <bf bf'>4. <c c'> |
+  \key c \minor bf8 d f bf f d bf d f bf f d |
+  
+  \time 18/8
+  \sixBeamException
+  
+  <d d'>2. ~ <d d'>4. <d d'> <ef ef'> <f f'> |
+  g,8 b d g d b g b d g d b g b d g d b |
+  
+  \time 7/4
+  \tempo "Like Bach" 4 = 90
+  
+  \bachFugue |
+  \bachFugueL |
+  \transpose c f \bachFugue |
+  \transpose c f \bachFugueL |
+  \ottava #'1 \transpose c bf \bachFugue |
+  \transpose c bf \bachFugueL |
+  
+  gf'16 gf' f gf ef gf df gf af, af' gf af f af ef af a, a' gs a fs a b, b' a b gs b |
+  bf''16 bf' af bf gf bf f bf c, c' bf c af c gf c cs, cs' b cs a cs ds, ds' cs ds b ds |
+  
+  \key fs \minor \transpose c fs' \bachFugue |
+  \key fs \minor <cs, cs'>8 <b b'> <a a'> <gs gs'> <fs fs'> 
+  <gs gs'> <a a'> <cs, cs'> <ds ds'> <es es'> <fs fs'> <es es'> <fs fs'> <gs gs'> |
+  
+  \times 4/6 { a16 fs cs a fs cs } 
+  \ottava #'0 \times 4/6 { fs cs a fs cs a }
+  \clef bass \times 4/6 { fs' cs a fs cs a }
+  \parenthesize fs8 <d' fs>4 <fs a>4 <gs b>8 <fs a> r |
+  <fs fs'>4 <fs, fs'> \clef bass <fs, fs'> 
+  <fs, fs'>8 <d d'>4 <b b'> <cs cs'>8 <fs fs'>8 r8 |
+  
+  \tempo "Presto" 4 = 100
+  
+  \time 6/4
+  \times 4/6 { a16 fs cs a cs fs } \clef treble \times 4/6 { a cs fs a fs cs }
+  \times 4/6 { a' fs cs a cs fs } \times 4/6 { a cs fs a fs cs }
+  \times 4/6 { a' fs cs a cs fs } \ottava #'1 \times 4/6 { a cs fs a fs cs } |
+  <fs fs'>4 <a a'>8 <gs gs'> <fs fs'>4 <cs' cs'>8 <a a'> <fs fs'>4 <fs' fs'>8 <cs cs'> |
+    
+  \time 2/4
+  a'32 fs cs a \ottava #'0 \times 4/5 { fs32[ a fs cs a] } \times 4/5 { fs a fs cs a } s8 |
+  <fs, fs'>8 s4 \times 4/5 { fs''32 a fs cs a } |
+  
+  \time 4/4
+  
+  r8 <a b fs'>4 <gs b es>8 <a cs fs>4 r8 <a' cs fs a>8 |
+  <fs, fs'>8 <b, b'>4 <cs cs'>8 <fs fs'>4 r8 <fs' fs'> |  
+  <fs a cs fs>4 r4 r2 \bar "||" |
+  <fs, fs'>4 r4 r2 |
 }
 
 \score {
diff --git a/broken-tranquility.pdf b/broken-tranquility.pdf
index 6b489ce..4b7a09a 100644
Binary files a/broken-tranquility.pdf and b/broken-tranquility.pdf differ