diff --git a/Makefile b/Makefile
index f7ce78c18d22f6f732a3f960119dc80c3e0c30e8..3186cbf245a91ed5e09b5c04214c54cbe4697941 100644
--- a/Makefile
+++ b/Makefile
@@ -7,25 +7,25 @@ instruments = O
 vocal = S A T B
 scores = OrganScore ChoralScore 
 # OrchestralScore LongScore
-extensions = $(instruments) $(vocal) $(scores)
+ext = $(instruments) $(vocal) $(scores)
 #  Cl Wd Cor Tre Br V Str StrQ ChStrQ
 
-pdfs = $(extensions:%=Pembaur_ErsteLateinischeMesse_Es-Dur_%.pdf) Pembaur_ErsteLateinischeMesse_Es-Dur.pdf
+pdfs = $(ext:%=Pembaur_ErsteLateinischeMesse_Es-Dur_%.pdf) Pembaur_ErsteLateinischeMesse_Es-Dur.pdf
 
 .PHONY: all clean
 all: $(instruments) $(vocal) $(scores)
-full: $(extensions)
+full: $(ext)
 instruments: $(instruments)
 vocal: $(vocal)
 scores: $(scores)
 
 clean: 
-	for i in $(extensions); do \
+	for i in $(ext); do \
 	  rm -f Pembaur_ErsteLateinischeMesse_Es-Dur_$${i}.pdf Pembaur_ErsteLateinischeMesse_Es-Dur_$${i}.ps; \
 	done; \
 	rm -f Pembaur_ErsteLateinischeMesse_Es-Dur.ps Pembaur_ErsteLateinischeMesse_Es-Dur.pdf;
 
-$(extensions): % : Pembaur_ErsteLateinischeMesse_Es-Dur_%.pdf $(SRCS)
+$(ext): % : Pembaur_ErsteLateinischeMesse_Es-Dur_%.pdf $(SRCS)
 
 %.pdf : %.ly
 	lilypond $< 
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_01_Kyrie.ly b/Pembaur_ErsteLateinischeMesse_Es-Dur_01_Kyrie.ly
index 866bd75eb029384173d0ac763f56541832aa8a13..ec26f9cc1d8ca5bcaef6d945b413d8bef64dc012 100644
--- a/Pembaur_ErsteLateinischeMesse_Es-Dur_01_Kyrie.ly
+++ b/Pembaur_ErsteLateinischeMesse_Es-Dur_01_Kyrie.ly
@@ -50,113 +50,113 @@ IKyrieSMusic = \relative c'' {
 }
 
 IKyrieAMusic = \relative c' {
-  R1*4 |
-  es4.\pdolce es8 es4 es |
-  es2\> es4\! es~ |
-  es d es \breathe g |
-  g2 f4 f~ |
-  f f g a\< |
-  g2 fis4\! \breathe g4 |
-  a4( c b a) |
-  b2 r |
-  R1 |
-  r4 b4 f g8[ a] |
-  g1( |
-  g4 a8[ b]) a4 \breathe a4\f |
-  a a f( e) |
-  f f a a | 
-  a( g) a \breathe g\ff |
-  f( g) a a |
-  a( g2.~ |
-  g4 f2. |
-  f4 es) es \breathe g |
-  f2.( es4) |
-  d2. r4 |
-  es4. es8 es4 \breathe es4 |
-  es2 es4 es~ |
-  es d es \breathe g |
-  g2 f4 \breathe f~ |
-  f f g \breathe g |
-  a( b) c2 |
-  b4.\accent g8 a4\f es |
-  es2.\> d4\! |
-  es4.\accent \p b8 b4 c8[( des]) |
-  c4( es2 es8[ d]) |
-  es1\espressivo |
+  R1*4 | % 5
+  es4.\pdolce es8 es4 es | % 6
+  es2\> es4\! es~ | % 7
+  es d es \breathe g | % 8
+  g2 f4 f~ | % 9
+  f f g as\< | \barNumberCheck #10
+  g2 fis4\! \breathe g4 | % 11
+  a4( c b a) | % 12
+  b2 r | % 13
+  R1 | % 14
+  r4 b4 f g8[ as] | % 15
+  g1~ | % 16
+  g4( as8[ b]) as4 \breathe as4\f | % 17
+  as as f( e) | % 18
+  f f as as | % 19
+  a( g) as \breathe g\ff | \barNumberCheck #20
+  f( g) as as | % 21
+  as( g2.~ | % 22
+  g4 f2. | % 23
+  f4 es) es \breathe g | % 24
+  f2.( es4) | % 25
+  d2. r4 | % 26
+  es4. es8 es4 \breathe es4 | % 27
+  es2 es4 es~ | % 28
+  es d es \breathe g | % 29
+  g2 f4 \breathe f~ | \barNumberCheck #30
+  f f g \breathe g | % 31
+  a( b) c2 | % 32
+  b4.\accent g8 as4\f es | % 33
+  es2.\> d4\! | % 34
+  es4.\accent \p b8 b4 c8[( des]) | % 35
+  c4( es2 es8[ d] | % 36
+  es1\espressivo) | % 37
   es2\pp\fermata r \bar "|."
 }
 
 IKyrieTMusic = \relative c' {
-  R1*4 |
-  b4.\pdolce b8 b4 \breathe b8[ h] |
-  c2 c4 r |
-  c b b \breathe es |
-  des(\> c) c\! r |
-  c\accent\< d es\! b |
-  b\< a a b\! |
-  c( es d c) |
-  d2 r |
-  r4 es c d8[ es] |
-  d2.( es8[ f]) |
-  b,4. c8 des4( c8[ b] |
-  es2) es4 \breathe es\f |
-  es \breathe as, as g |
-  as \breathe as as b |
-  b2 c4 des\ff |
-  c2 c4 ces4 |
-  b2.( as4 |
-  as2. g4 |
-  g2) g4 c |
-  c1\accent |
-  f,4 b2\accent b4 |
-  b2.\p b8[ h] |
-  c2\> c4\! r |
-  c4 b b \breathe es |
-  des( c) c r |
-  c d es \breathe es |
-  es2 es4\<( f) |
-  g4.\! es8 es4 c |
-  b2. as4 |
-  g4. g8 g4 as8[ b] |
-  c2( ces |
-  b1) |
+  R1*4 | % 5
+  b4.\pdolce b8 b4 \breathe b8[ h] | % 6
+  c2 c4 r | % 7
+  c b b \breathe es | % 8
+  des(\> c) c\! r | % 9
+  c\accent\< d es\! b | \barNumberCheck #10
+  b\<( a) a b\! | % 11
+  c( es d c) | % 12
+  d2 r | % 13
+  r4 es c d8[ es] | % 14
+  d2.( es8[ f]) | % 15
+  b,4. c8 des4( c8[ b] | % 16
+  es2) es4 \breathe es\f | % 17
+  es \breathe as, as( g) | % 18
+  as \breathe as as b | % 19
+  b2 c4 des\ff | \barNumberCheck #20
+  c2 c4 ces4 | % 21
+  b2.( as4 | % 22
+  as2. g4 | % 23
+  g2) g4 c | % 24
+  c1\accent | % 25
+  f,4 b2\accent b4\> | % 26
+  b2.\!\p b8[ h] | % 27
+  c2\> c4\! r | % 28
+  c4 b b \breathe es | % 29
+  des( c) c r | \barNumberCheck #30
+  c d es \breathe es | % 31
+  es2 es4\<( f) | % 32
+  g4.\! es8 es4 c | % 33
+  b2. as4 | % 34
+  g4. g8 g4 as8[ b] | % 35
+  c2( ces | % 36
+  b1) | % 37
   b2\fermata r \bar"|."
 }
 
 IKyrieBMusic = \relative c {
-  R1*4 |
-  es4.\accent\pdolce g8 g4 \breathe g |
-  as2\> as4\! r |
-  f4.\< f8\!\> es4 \breathe es\! |
-  e2\> f4\! r |
-  as4. as8 g4 g |
-  es4( c) d g\accent |
-  f1 |
-  b4 b f g8[ as] |
-  g4( es) as f |
-  b4( as2 g8[ f]) |
-  es4 \breathe es es2(~ |
-  es4 f8[ g]) as4 as\f |
-  as f c2 |
-  f4\breathe f f f |
-  es2 as4 b\ff |
-  as( b) as \breathe d,( |
-  es f) g c, |
-  d( es) f h,( |
-  c d) es\> e\! |
-  f2(\> as,) |
-  b2.\! r4 |
-  es4. g8 g4 \breathe g |
-  as2\> as4\! r |
-  f4. f8 es4 \breathe es |
-  e2 f4 r |
-  as4.\accent as8 g4 es |
-  f( g) as \breathe a |
-  b( des) c\f a |
-  b2(\> b,\!) |
-  es1~\p |
-  es~ |
-  es~ |
+  R1*4 | % 5
+  es4.\accent\pdolce g8 g4 \breathe g | % 6
+  as2\> as4\! r | % 7
+  f4.\< f8\!\> es4 \breathe es\! | % 8
+  e2\> f4\! r | % 9
+  as4. as8 g4 g | \barNumberCheck #10
+  es4( c) d g\accent | % 11
+  f1 | % 12
+  b4 b f g8[ as] | % 13
+  g4( es) as f | % 14
+  b4( as2 g8[ f]) | % 15
+  es4 \breathe es es2(~ | % 16
+  es4 f8[ g]) as4 as\f | % 17
+  as f c2 | % 18
+  f4\breathe f f f | % 19
+  es2 as4 b\ff | \barNumberCheck #20
+  as( b) as \breathe d,( | % 21
+  es f) g c, | % 22
+  d( es) f h,( | % 23
+  c d) es\> e\! | % 24
+  f2(\> as,) | % 25
+  b2.\! r4 | % 26
+  es4. g8 g4 \breathe g | % 27
+  as2\> as4\! r | % 28
+  f4. f8 es4 \breathe es | % 29
+  e2 f4 r | \barNumberCheck #30
+  as4.\accent as8 g4 es | % 31
+  f( g) as \breathe a | % 32
+  b( des) c\f a | % 33
+  b2(\> b,\!) | % 34
+  es1~\p | % 35
+  es~ | % 36
+  es~ | % 37
   es2\fermata r \bar"|."
 }
 
@@ -211,7 +211,7 @@ IKyrieTLyrics = \lyricmode {
   Ky -- ri -- e e -- lei -- son, 
   Ky -- ri -- e e -- lei -- son, 
   Ky -- ri -- e e -- lei -- son, 
-  Ky -- ri -- e e -- lei -- son.
+  Ky -- ri -- e e -- lei -- son. __
 }
 
 IKyrieBLyrics = \lyricmode {
@@ -232,6 +232,199 @@ IKyrieBLyrics = \lyricmode {
   e -- lei -- son, e -- lei -- son. __ 
 }
 
+IKyrieVoiceFemale = \relative c'' {
+  \IKyrieKey \IKyrieSettings R1*4 |
+   |
+}
+\addQuote "IKyrieVoiceFemale" \IKyrieVoiceFemale
+
+IKyrieVoiceMaleI = \relative c {
+  \IKyrieKey \IKyrieSettings s1*4 |
+  s2. b8[ h] | c2 s2 | 
+}
+\addQuote "IKyrieVoiceMaleI" \IKyrieVoiceMaleI
+
+IKyrieVoiceMaleII = \relative c {
+  \IKyrieKey \IKyrieSettings s1*4 |
+  es4. g8 g4 g4 | as2 s2 | 
+}
+\addQuote "IKyrieVoiceMaleII" \IKyrieVoiceMaleII
+
+IKyrieOIaMusic =  \relative c'' {
+  \tempo "Andante religioso" 
+  b2. b4 | % 2
+  c4. as8 as4 c4 | % 3
+  es4.( b8) b4 es, | % 4
+  as2 g4 f \bar"||" % 5
+  << {g2 s } \new CueVoice = "IKyrieOIaCues" { \voiceThree \cueText "Singst." g4.( <es b>8 <es b>4 <es g>) | \cueText "Orgel" } >>
+  g4 g f g | % 7
+  as4. b8 g4 b4~ | % 8
+  b4.( c8 as4 b | % 9
+  c2) b | \barNumberCheck #10
+  es d4. es8 | % 11
+  f1 | % 12
+  d2 s | % 13 % TODO: s2 missing or d1???
+  r4 es,4 c d8[( es]) | % 14
+  r4 b' f g8[ as] | % 15
+  r4 es' b c8[ des] | % 16
+  des2 c4 c\f | % 17
+  c2 c | % 18
+  c2. d4 | % 19
+  es2. e4 | \barNumberCheck #20
+  f4 c f2~ | % 21
+  f4 b, es2~ | % 22
+  es4 as, d2~ | % 23
+  d4 g, c b~ | % 24
+  b as2 g4 | % 25
+  f2. r4 | % 26
+  <es g>4 r r2 | % 27
+  r4 g4( f g | % 28
+  as4. b8) g4 b | % 29
+  b4. c8 as4 b | \barNumberCheck #30 % FIXED: c8 statt c4
+  c2 b | % 31
+  des4. es8 c4 es! | % 32
+  es2 es | % 33
+  g, f | % 34
+  es1 | % 35
+  as4. es8 es4. f8 | % 36
+  g1 | % 37
+  g2\fermata r \bar"|."
+}
+
+IKyrieOIbMusic =  \relative c'' {
+  <g b,>4. <es g,>8 <es~ g,>2 | % 2
+  es4 es2 as4 | % 3
+  es2. es4 | % 4
+  es4. f8 d2 \bar "||" % 5
+  s1 | % 6
+  es1~ | % 7 % FIXED: es1~ instead of es2.~ 
+  es4 d es g~ | % 8
+  g2 f~ | % 9
+  f2 g4 as | \barNumberCheck #10 % FIXED: f1 changed to f2
+  g2 fis4 g | % 11
+  a c b a | % 12
+  b1 | % 13
+  s1 | % 14
+  d,2. es8[ f] | % 15
+  g1~ | % 16
+  g4 as8[ b] as4 as | % 17
+  as2 f4 e | % 18
+  f2 as~ | % 19
+  as4 g as g | \barNumberCheck #20
+  f g as2~ | % 21
+  as4 g2.~ | % 22
+  g4 f2.~ | % 23
+  f4 es2 g4 | % 24
+  f2. es4 | % 25
+  d2. r4 | % 26
+  s4 r4 s2 | % 27
+  r4 es2.~ | % 28
+  es4 d es g | % 29
+  g2 f~ | \barNumberCheck #30
+  f g | % 31
+  as4 b c2 | % 32
+  b4. g8 as4 es~ | % 33
+  es2. d4 | % 34
+  es4 b2 c8[ des] | % 35
+  c2 es | % 36
+  es1 | \barNumberCheck #37
+  es2 r \bar"|."
+}
+
+IKyrieODynamics = {
+  s1\p |
+  s1*14 |
+  s2. s4\f |
+  s1*2 |
+  s2. s4\ff |
+  s1*5 |
+  s2. s4\p |
+  s1 |
+  s4 s\p s s |
+  s1*2 |
+  s4\< s2. |
+  s2. s4\! |
+  s4 s\f\> s s |
+  s2 s2\! |
+  s1*4 \bar "|."
+}
+
+IKyrieOIIaMusic =  \relative c' {
+  s1 | % 2
+  as4.( c8) es4 es | % 3
+  b es des << { c~ | % 4
+  c ces} \new CueVoice = "IKyrieOIIaCues" { \voiceThree as4~ | as2 } >> b2 \bar"||" % 5
+  << {b2 s2 | s4 c2 } \new CueVoice = "IKyrieOIIaCues" {\voiceThree s2 s4 b8[ h] | <as c>2 } >> b4 | % 7  % TODO: Really s4?
+  c4 b2 es4 | % 8
+  des4 c2. | % 9
+  \change Staff="IKyrieOISt" \voiceFour c4 d es \change Staff="IKyrieOIISt" \voiceOne b4~ | \barNumberCheck #10
+  b a2 b4 | % 11
+  c es d c | % 12
+  d2 r | % 13
+  s1*2 | % 15
+  b4. c8 des4 c8[ b] | % 16
+  es2~ es4 es4~ | % 17
+  es as,2 g4 | % 18
+  as2. b4 | % 19
+  b2 c4 des | \barNumberCheck #20
+  c2. ces4 | % 21
+  b2. as4 | % 22
+  as2. g4 | % 23
+  g2. c4 | % 24
+  c1( | % 25
+  f,4) b2-> b4~ | % 26
+  b r r2 | % 27
+  r4 c2 b4 | % 28
+  c4 b2 es4 | % 29
+  des4 c2.~ | \barNumberCheck #30
+  c4 d es2 | % 31
+  es2. f4 | % 32
+  g4. g8 es4 c | % 33
+  b2. as4 | % 34
+  g2. as8[ b] | % 35
+  c2 ces | % 36
+  b1 | \barNumberCheck #37
+  b2\fermata r2 \bar"|."
+}
+
+IKyrieOIIbMusic =  \relative c {
+  es1~\p | % 2
+  es2 c'4 as | % 3
+  g2 s4 ges4 | % 4 % TODO: Really s4?
+  f2 b, \bar"||" % 5
+  << {es2 s | r4 as2 g4 } \new CueVoice = "IKyrieOIIbCues" {\voiceFour s2 s4 b8[ h] } >>| % 7  % TODO: Really s4?
+  f4. f8 es4 es | % 8
+  e e( f g | % 9
+  as2) g4 f | \barNumberCheck #10
+  es c d g | % 11
+  f1 | % 12
+  b4 b f g8[ as] | % 13
+  g4 es as f | % 14
+  b as2 g8[ f] | % 15
+  es1~ | % 16
+  es4 f8[ g] as4 as_"Ped" | % 17
+  as f c2 | % 18
+  f2. fes4 | % 19
+  es2 as4 b | \barNumberCheck #20
+  as4( b) as d, | % 21
+  es f g c, | % 22
+  d es f h, | % 23
+  c d es e | % 24
+  f2 as, | % 25
+  b2. s4 | % 26 % TODO: r4 instead of s4?
+  es r r2 | % 27
+  r4 as2 g4 | % 28
+  f2 es | % 29
+  e f4 g | \barNumberCheck #30
+  as2 g4 es | % 31
+  f g as a | % 32
+  b des c a | % 33
+  b2 b, | % 34
+  es1~ | % 35
+  es1~ | % 36
+  es1~ | \barNumberCheck #37
+  es2 r2 \bar"|."
+}
 
 
 
@@ -240,20 +433,21 @@ IKyrieBLyrics = \lyricmode {
 %%%                STAVES                 %%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-% IKyrieOStaff = \context PianoStaff = "IKyrieOSt" \with { instrumentName = "Orgel" shortInstrumentName = "Org." } <<
+IKyrieOStaff = \context PianoStaff = "IKyrieOSt" \with { instrumentName = "Orgel" shortInstrumentName = "Org." } <<
 %   \context Staff = "IKyrieOISt" {\IKyrieCueLabels}
-%   \context Dynamics = "IKyrieODynamics" { s1*65 }
-%   \context Staff = "IKyrieOIISt" {s1*65}
-%   \context Staff = "IKyrieOISt" << 
-%     \OIClef
-%     \context Voice = "IKyrieOIa" { \voiceOne \IKyrieKey\IKyrieSettings\IKyrieOIaMusic }
-%     \context Voice = "IKyrieOIb" { \voiceTwo \IKyrieKey\IKyrieSettings\IKyrieOIbMusic }
-%     \context Voice = "IKyrieODynamics" { \IKyrieSettings\dynamicDown\IKyrieODynamics }
-%   >> 
-% %   \context Dynamics = "IKyrieODynamics" { \IKyrieODynamics }
-%   \context Staff = "IKyrieOIISt" <<
-%     \OIIClef
-%     \context Voice = "IKyrieOIIa" { \voiceOne \IKyrieKey\IKyrieSettings\IKyrieOIIaMusic }
-%     \context Voice = "IKyrieOIIb" { \voiceTwo \IKyrieKey\IKyrieSettings\IKyrieOIIbMusic }
-%   >>
-% >>
+  \context Staff = "IKyrieOISt" {s1*37}
+%   \context Dynamics = "IKyrieODynamics" { s1*37 }
+  \context Staff = "IKyrieOIISt" {s1*37}
+  \context Staff = "IKyrieOISt" << 
+    \OIClef
+    \context Voice = "IKyrieOIa" { \voiceOne \IKyrieKey\IKyrieSettings\IKyrieOIaMusic }
+    \context Voice = "IKyrieOIb" { \voiceTwo \IKyrieKey\IKyrieSettings\IKyrieOIbMusic }
+    \context Voice = "IKyrieODynamics" { \IKyrieSettings\dynamicDown\IKyrieODynamics }
+  >> 
+%   \context Dynamics = "IKyrieODynamics" { \IKyrieODynamics }
+  \context Staff = "IKyrieOIISt" <<
+    \OIIClef
+    \context Voice = "IKyrieOIIa" { \voiceOne \IKyrieKey\IKyrieSettings\IKyrieOIIaMusic }
+    \context Voice = "IKyrieOIIb" { \voiceTwo \IKyrieKey\IKyrieSettings\IKyrieOIIbMusic }
+  >>
+>>
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_02_Gloria.ly b/Pembaur_ErsteLateinischeMesse_Es-Dur_02_Gloria.ly
index 11cf4816b2606ef8aab7d27f5a90af53119568cf..5a5156bd54f1e0ca4cdc0939e5e431d029548e5e 100644
--- a/Pembaur_ErsteLateinischeMesse_Es-Dur_02_Gloria.ly
+++ b/Pembaur_ErsteLateinischeMesse_Es-Dur_02_Gloria.ly
@@ -12,10 +12,6 @@ IIGloriaSettings = \notemode {
   \time 4/4
 }
 
-IIGloriaCueLabels = \notemode {
-  \IIGloriaSettings
-}
-
 
 IIGloriaSMusic = \relative c'' {
   b2.\f b4 | % 2
@@ -39,7 +35,7 @@ IIGloriaSMusic = \relative c'' {
   b2 r | \barNumberCheck #20
   r4 d4-> d d | % 21
   g,2\mf g2 | % 22
-  a\> a | % 23
+  a\< a | % 23
   b2 h4 h | % 24
   c2\! r | % 25
   r4\f es4-> es es | % 26
@@ -65,12 +61,12 @@ IIGloriaSMusic = \relative c'' {
   b2-> a | % 46
   g2.\>( a4 | % 47
   b1^\rit\!) | % 48
-  a2.\p \tempo "a tempo" r4 | % 49
-  b4.\f b8 a4 b | \barNumberCheck #50
+  a2.\p r4 | % 49
+  \tempo "a tempo" b4.\f b8 a4 b | \barNumberCheck #50
   d2 d | % 51
   f1 | % 52
   d2 r | % 53
-  r4\f f4-> f4-> f-> | % 54
+  r4 f4->\f f4-> f-> | % 54
   es4. es8 es2 | % 55
   d2 g4 g | % 56
   fis4. fis8 fis2 | % 57
@@ -152,8 +148,8 @@ IIGloriaAMusic = \relative c'' {
   d2 d | % 46
   d( cis~ | % 47
   cis^\pocorit d) | % 48 % TODO: is this a c or a cis???
-  d2. r4 \tempo "a tempo" | % 49
-  b'4. b8 a4 b4 | \barNumberCheck #50
+  d2. r4 | % 49
+  \tempo "a tempo" b'4. b8 a4 b4 | \barNumberCheck #50
   d2 d | % 51
   a1 | % 52
   b2 r4 f | % 53
@@ -202,7 +198,7 @@ IIGloriaTMusic = \relative c' {
   b4. b8 f4 f | % 9
   fis4( e d e) | \barNumberCheck #10
   fis d' d d| % 11
-  f1~ | % 12
+  f!1~ | % 12
   f2 r | % 13
   cis4 cis8 cis cis4 cis | % 14
   d2 r | % 15
@@ -239,8 +235,8 @@ IIGloriaTMusic = \relative c' {
   g2 a | % 46
   b2.\>( a4\!) | % 47
   g1^\rit | % 48
-  fis2. r4 \tempo "a tempo" | % 49
-  b4.\f b8 a4 b| \barNumberCheck #50
+  fis2. r4 | % 49
+  \tempo "a tempo" b4.\f b8 a4 b| \barNumberCheck #50
   d2 d | % 51
   c1 | % 52
   d2 r4 d | % 53
@@ -263,8 +259,8 @@ IIGloriaTMusic = \relative c' {
   es2 es | \barNumberCheck #70
   e4. e8 e4 c | % 71
   c2 c2 | % 72
-  d4. d8 d4 b\ff | % 73
-  des2 es4 es | % 74
+  d4. d8 d4 b | % 73
+  des2\ff es4 es | % 74
   es2. es4 | % 75
   d2 b | % 76
   b2( as4 g | % 77
@@ -280,18 +276,18 @@ IIGloriaTMusic = \relative c' {
 
 IIGloriaBMusic = \relative c' {
   b2. b4 | % 2
-  b2 as4 b | % 3
+  b2 a4 b | % 3
   d2 d | % 4
   f,1 | % 5
   b2 b,4\p b | % 6
   b4. b8 b4 b' | % 7
   g4. f8 es4 r | % 8
   b'4. b8 b,4 b | % 9
-  as1\> | \barNumberCheck #10
+  a1\> | \barNumberCheck #10
   d2\! r | % 11
   r4 f8 f f4 f8 f | % 12
   b2 r | % 13
-  as4 as8 as as4 as | % 14
+  a4 a8 a a4 a | % 14
   d, d'2-> d4 | % 15
   f,2 es | % 16
   d4. d8 es2 | % 17
@@ -300,7 +296,7 @@ IIGloriaBMusic = \relative c' {
   b4 b-> b b | \barNumberCheck #20
   d,2 d | % 21
   g1\< | % 22
-  f2 as\! | % 23
+  f2 a\! | % 23
   g2. g4 | % 24
   c,2 r | % 25
   r4 es f g | % 26
@@ -351,11 +347,11 @@ IIGloriaBMusic = \relative c' {
   b2-> b | % 71
   a4. a8 a4 f | % 72
   b1(~\< | % 73
-  b2\! ces | % 74
+  b2\!\ff ces | % 74
   c) f,4 f | % 75
   b2 d, | % 76
   es( f4 es | % 77
-  d a h) c | % 78
+  d c h) c | % 78
   f1~ | % 79
   f | \barNumberCheck #80
   b2 r | % 81
@@ -370,7 +366,7 @@ Glo -- ri -- a in ex -- cel -- sis De -- o,
 et in ter -- ra pax ho -- mi -- ni bus bo -- nae vo -- lun -- ta -- tis, 
 be -- ne -- di -- ci -- mus te, 
 % a -- do -- ra -- mus te, 
-glo -- ri -- fi -- ca -- mus te%.
+glo -- ri -- fi -- ca -- mus te,
 % Gra -- ti -- as a -- gi -- mus ti -- bi 
 pro -- pter ma -- gnam glo -- ri -- am tu -- am. 
 Do -- mi -- ne De -- us Pa -- ter o -- mni -- po -- tens.
@@ -461,42 +457,394 @@ cum san -- cto Spi -- ri -- tu
 in glo -- ri -- a De -- i Pa -- tris. A -- men, a -- men, a -- men.
 }
 
+IIGloriaCueLabels = \notemode {
+  \cueText "Singst." s1*2 |
+  \cueText "Orgel" s1*2 |
+  \cueText "Singst." s1*2 |
+}
+
+IIGloriaOIaMusic =  \relative c'' {
+  R1 | % 2
+  R1 | % 3
+  d1 | % 4
+  f | % 5
+  d2 d, | % 6
+  es2 d4 f | % 7
+  d4. f8 g4 r | % 8
+  f2 b4 d | % 9
+  a1~ | \barNumberCheck #10
+  a2 r | \barNumberCheck #11
+  r4 <a c>2 <a c>4 | % 12
+  <b d>2 r \oneVoice | % 13
+  <a~ cis e>1 | % 14
+  <a d f>2 r | % 15
+  r4 <c,f a>2 \voiceOne a'4 | % 16
+  f'2. es4 | % 17
+  es2 d | % 18
+  c1 | % 19
+  <b f d>2 r | \barNumberCheck #20
+  r4 d2 d4 | % 21
+  g,1 | % 22
+  a | % 23
+  b2 h | % 24
+  c4 c2 c4 | % 25
+  r es2 es4 | % 26
+  as,1 | % 27
+  b1 | % 28
+  c | % 29
+  <d f,>4 <d f,>2 <d f,>4 | \barNumberCheck #30
+  c1 | % 31
+  c4 a2 a4 | % 32
+  b1 | % 33
+  a2 r | % 34
+  r4 d2 d4 | % 35
+  es1 | % 36
+  d2 c | % 37
+  b1 | % 38
+  a | % 39
+  g | \barNumberCheck #40
+  <a f>2 <a f>2 | % 41
+  d1 | % 42
+  c2 b4 a | % 43
+  g1 | % 44
+  a2 f | % 45
+  b a | % 46
+  g2.( a4) | % 47
+  b1^\rit | % 48
+  \tempo "a tempo" a2 r | % 49
+  b2 a4 b | \barNumberCheck #50
+  d1 | % 51
+  f | % 52
+  d2 r4 <d,f> | % 53
+  r f'2 f4 | % 54
+  es1 | % 55
+  d2 g | % 56
+  fis1 | % 57
+  g2( b,4 c) | % 58
+  d2( c4 b) | % 59
+  c2 r4 f, | \barNumberCheck #60
+  b1 | % 61
+  < a f c>4. <f c a>8 f2 | % 62
+  d'2. b4 | % 63
+  <d b f>2 <c a> | % 64
+  es d | % 65
+  des c | % 66
+  h4 c d es | % 67
+  s1 | % 68
+  s2 r4 <b f>4 | % 69
+  <b es>2 des | \barNumberCheck #70
+  <c g e>2. <c g e>4 | % 71
+  f2 es | % 72
+  <d b f>2. <b f d>4 | % 73
+  ges'1 | % 74
+  f1~ | % 75
+  f1~ | % 76
+  f4 es d c | % 77
+  h c d es | % 78
+  d1 | % 79
+  c | \barNumberCheck #80
+  s2 r2 | % 81
+  <es g,>1 | % 82
+  <d f,>2 r | % 83
+  <f a,>1 | % 84
+  <d f,>2\fermata r \bar"|."
+}
+
+IIGloriaOIbMusic =  \relative c'' {
+  b2. b4 | % 2
+  b2 a4 b | % 3
+  r8 f[( d f] b[) f( b d]) | % 4
+  a1 | % 5
+  b2 b, | % 6
+  b4. a8 b4 d | % 7
+  d4. d8 es4 r | % 8
+  d2 <d f>4 d~ | % 9
+  d( cis h cis) | \barNumberCheck #10
+  d2 r | % 11
+  f1~ | % 12
+  f4 f2 f4 | % 13
+  s1*3 | % 16
+  b4 a g2 | % 17
+  c b | % 18
+  g2 f4( es) | % 19 % TODO: Check whether it should be g4 f4 f4( es) or g2 f4( es) or something else...
+  s2 r | \barNumberCheck #20
+  r4 fis e fis | % 21
+  g2 d4( e) | % 22
+  f1 | % 23
+  g | % 24
+  <es g>2 r | % 25
+  es1~ | % 26
+  es | % 27
+  es2 f | % 28
+  f1 | % 29
+  s1 | \barNumberCheck #30
+  e2 f4 g | % 31
+  f4 f2 es4 | % 32
+  d2 des | % 33
+  c f | % 34
+  f1 | % 35
+  es2 fis | % 36
+  g d | % 37
+  d1~ | % 38
+  d2 f~ | % 39
+  f e | \barNumberCheck #40
+  s1 | % 41
+  f1 | % 42
+  f1~ | % 43
+  f2 e | % 44
+  e1 | % 45
+  d1~ | % 46
+  d2 cis~ | % 47
+  cis d~ | % 48
+  d r | % 49
+  s1*2 | \barNumberCheck #51
+  a'1 | % 52
+  b | % 53
+  <f c> | % 54
+  b2 g4( a) | % 55
+  b2 g | % 56
+  a1 | % 57
+  g | % 58
+  f | % 59
+  f | \barNumberCheck #60
+  <f d>2 <e b> | % 61
+  s2 <c a>4 es | % 62
+  f1 | % 63
+  s1 | % 64
+  b4 c f,2 | % 65
+  as4 b es,2 | % 66
+  g1 | % 67
+  <b d>2 <a c>2 | % 68
+  <b d> r4 d, | % 69
+  es1 | \barNumberCheck #70
+  s1 | % 71
+  <f c'>1 | % 72
+  s1 | % 73
+  ges1 | % 74
+  a | % 75
+  b2. as4~  | % 76
+  as g f g | % 77
+  as g2. | % 78
+  f2 b~ | % 79
+  b a | \barNumberCheck #80
+  b r | % 81
+  s1 | % 82
+  s2 r | % 83
+  s1 | % 84
+  s2 r \bar"|."
+}
+
+IIGloriaODynamics = {
+s1*4 | % 5
+s2 s2\p | % 6
+s1*4 | \barNumberCheck #10
+s1\f | % 11
+s1*14 | \barNumberCheck #25
+s1\f | % 26
+s1*3 | % 29
+s4 s2\ff s4 | \barNumberCheck #30
+s1 |
+s4 s2\p s4 |
+s1*8 |
+s2 s2\f |
+s1*3 |
+s2 s2\p |
+s1*4 |
+s2\f s |
+s1*18 |
+s1\ff | % TODO: put \ff at first or third beat?
+s1*16\bar"|."
+}
+
+IIGloriaOIIaMusic =  \relative c' {
+  b2. b4 | % 2
+  b2 a4 b | % 3
+  d1 | % 4
+  <c f,>1 | % 5
+  d2 f, | % 6
+  g4. f8 f4 b | % 7
+  b2 b4 r | % 8
+  s2. f4 | % 9
+  fis e d e | \barNumberCheck #10
+  fis d'2 d4 | % 11
+  r4 s2. | % 12
+  s2 r | % 13
+  a2 s | % 14
+  a4 d2 d4 | % 15
+  s1 | % 16
+  b2 s | % 17
+  a b | % 18
+  b a | % 19
+  b4 b2 b4 | \barNumberCheck #20
+  r a g a | % 21
+  b1 | % 22
+  c2 s | % 23
+  d1 | % 24
+  s2 r | % 25
+  r4 s2. | % 26
+  c1 | % 27
+  es2. d4 | % 28
+  c2. es4 | % 29
+  s b2 a4 | \barNumberCheck #30
+  g2 a4 b | % 31
+  a2 r | % 32
+  r4 s2. | % 33
+  r4 a2 a4 | % 34
+  b2 as | % 35
+  g4( c b a) | % 36
+  b2 fis | % 37
+  g1 | % 38
+  f2 c' | % 39
+  c1 | \barNumberCheck #40
+  c2 c | % 41
+  d b | % 42
+  c1 | % 43
+  b | % 44
+  a2 a | % 45
+  g a | % 46
+  b2. a4 | % 47
+  g1 | % 48
+  fis2 r | % 49
+  b2 a4 b4 | \barNumberCheck #50
+  d1 | % 51
+  c | % 52
+  d | % 53
+  a | % 54
+  es' | % 55
+  f2 d | % 56
+  d1 | % 57
+  es2 g,4 a | % 58
+  b2 a4 g | % 59
+  a2 r4 f | \barNumberCheck #60
+  s1*2 | % 62
+  \change Staff=IIGloriaOISt \voiceFour d'2. f4 | % 63
+  \change Staff=IIGloriaOIISt \voiceOne s1 | % 64
+  es4 c d b | % 65
+  des b c2 | % 66
+  s1 | % 67
+  d4 f2 es4 | % 68
+  d2 r4 s4 | % 69
+  s1 | \barNumberCheck #70
+  s1*3 | % 73
+  s2 es2 | % 74
+  es1 | % 75
+  d2 b2~ | % 76
+  b as4 g | % 77
+  d( g as g) | % 78
+  b2 d | % 79
+  f2. es4 | \barNumberCheck #80
+  d4 s2. | % 81
+  b1 | % 82
+  s1 | % 83
+  c2. d4 | % 84
+  d2  r2 \bar"|." \barNumberCheck #85
+}
+
+IIGloriaOIIbMusic =  \relative c {
+  R1 | % 2
+  R1 | % 3
+  r8 f8[( d f] b)[ f( b d]) | % 4
+  f,,4 a c f | % 5
+  b,2 b | % 6
+  b2. b'4 | % 7
+  g4. f8 es4 r | % 8
+  b'2 b, | % 9
+  a1 | \barNumberCheck #10 % FIXED: changed a2 to a1
+  d2 r | % 11
+  \oneVoice
+  r4 f2 f4 | % 12
+  b,2 r2 | % 13
+  \voiceTwo r4 a'2 a4 | % 14
+  d,2 r | % 15
+  f es | % 16
+  d es | % 17
+  f g | % 18
+  es f | % 19
+  b, r | \barNumberCheck #20
+  d1 | % 21
+  g | % 22
+  f2 a | % 23
+  g1 | % 24
+  c,2 r | % 25
+  r4 <es g> <f as> <g b> | % 26
+  as1 | % 27
+  g2 b | % 28
+  a1 | % 29
+  <b d>4 b,2 b4 | \barNumberCheck #30
+  c1 | % 31
+  f2 r | % 32
+  r4 g2 e4 | % 33
+  f2 es | % 34
+  d c4 h | % 35
+  c1 | % 36
+  b2 a | % 37
+  g b | % 38
+  d a | % 39
+  c1 | \barNumberCheck #40
+  f2 f | % 41
+  b b | % 42
+  a2 g4 f | % 43
+  g2 c, | % 44
+  cis d | % 45
+  g f | % 46
+  c1~ | % 47
+  c2 d | % 48
+  d r | % 49
+  b' a4 b | \barNumberCheck #50
+  d1 | % 51
+  f, | % 52
+  b4 b2 b4 | % 53
+  a1 | % 54
+  g2 c | % 55
+  b1 | % 56
+  d2. d,4 | % 57
+  es1 | % 58
+  f | % 59
+  f | \barNumberCheck #60
+  b2 g | % 61
+  f2. c'4 | % 62
+  b2 b,4 d | % 63
+  f1 | % 64
+  g4 a b2 | % 65
+  f4 g as g | % 66
+  <f d'> <es c'> <d h'> <c c'> | % 67
+  f2. f4 | % 68
+  as1 | % 69
+  g2. g4 | \barNumberCheck #70
+  b1 | % 71
+  a2. f4 | % 72
+  b1 | % 73
+  <b des>2 <ces es> | % 74
+  c f, | % 75
+  b d, | % 76
+  es f4 es | % 77
+  d c h c | % 78
+  f1~ | % 79
+  f | \barNumberCheck #80
+  b4 b2 b4 | % 81
+  es,1 | % 82
+  b'2 r | % 83
+  f1 | \barNumberCheck #84
+  <b b,>2\fermata r \bar"|."
+}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%                STAVES                 %%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-% IIGloriaOIaMusic =  \relative e' {
-% }
-% 
-% IIGloriaOIbMusic =  \relative c' {
-% }
-% 
-% IIGloriaODynamics = {
-% }
-% 
-% IIGloriaOIIaMusic =  \relative g {
-% }
-% 
-% IIGloriaOIIbMusic =  \relative c {
-% }
-% 
-% 
-% 
-% 
-% 
-% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %%%                STAVES                 %%%
-% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% 
-% IIGloriaOStaff = \context PianoStaff = "IIGloriaOSt" \with { instrumentName = "Orgel" shortInstrumentName = "Org." } <<
+IIGloriaOStaff = \context PianoStaff = "IIGloriaOSt" \with { instrumentName = "Orgel" shortInstrumentName = "Org." } <<
 %   \context Staff = "IIGloriaOISt" {\IIGloriaCueLabels}
-%   \context Staff = "IIGloriaOISt" << 
-%     \OIClef
-%     \context Voice = "IIGloriaOIa" { \voiceOne \IIGloriaKey\IIGloriaSettings\IIGloriaOIaMusic }
-%     \context Voice = "IIGloriaOIb" { \voiceTwo \IIGloriaKey\IIGloriaSettings\IIGloriaOIbMusic }
-%     \context Voice = "IIGloriaODynamics" { \IIGloriaSettings\dynamicDown\IIGloriaODynamics }
-%   >> 
-% %   \context Dynamics = "IIGloriaODynamics" { \IIGloriaODynamics }
-%   \context Staff = "IIGloriaOIISt" <<
-%     \OIIClef
-%     \context Voice = "IIGloriaOIIa" { \voiceOne \IIGloriaKey\IIGloriaSettings\IIGloriaOIIaMusic }
-%     \context Voice = "IIGloriaOIIb" { \voiceTwo \IIGloriaKey\IIGloriaSettings\IIGloriaOIIbMusic }
-%   >>
-% >>
+  \context Staff = "IIGloriaOISt" << 
+    \OIClef
+    \context Voice = "IIGloriaOIa" { \voiceOne \IIGloriaKey\IIGloriaSettings\IIGloriaOIaMusic }
+    \context Voice = "IIGloriaOIb" { \voiceTwo \IIGloriaKey\IIGloriaSettings\IIGloriaOIbMusic }
+    \context Voice = "IIGloriaODynamics" { \IIGloriaSettings\dynamicDown\IIGloriaODynamics }
+  >> 
+%   \context Dynamics = "IIGloriaODynamics" { \IIGloriaODynamics }
+  \context Staff = "IIGloriaOIISt" <<
+    \OIIClef
+    \context Voice = "IIGloriaOIIa" { \voiceOne \IIGloriaKey\IIGloriaSettings\IIGloriaOIIaMusic }
+    \context Voice = "IIGloriaOIIb" { \voiceTwo \IIGloriaKey\IIGloriaSettings\IIGloriaOIIbMusic }
+  >>
+>>
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_03_Credo.ly b/Pembaur_ErsteLateinischeMesse_Es-Dur_03_Credo.ly
index 5ba909e96c3b24db3e7c0836ef0c3ac509befbca..b3b130466b160b7a2eb4d380cfd1520d202c9444 100644
--- a/Pembaur_ErsteLateinischeMesse_Es-Dur_03_Credo.ly
+++ b/Pembaur_ErsteLateinischeMesse_Es-Dur_03_Credo.ly
@@ -235,7 +235,7 @@ IIICredoAMusic = \relative c' {
   a' a8 a f4 f | % 95
   b4. b8 a4 f | % 96
   f4 f8 f b4 g | % 97
-  f4. g8 f2 | % 98
+  g4. g8 f2 | % 98
   r r4 d4( | % 99
   b' a g) f | \barNumberCheck #100
   g1~( | % 101
@@ -350,7 +350,7 @@ IIICredoTMusic = \relative c' {
   e( f) c2 | % 102
   d( c) | % 103
   c f,4 f | % 104
-  <b d>\breve | % 105
+  <b d>\breve | % 105 % FIXED: breve instead of whole
   <a c>\breve\fermata \bar"|."
 }
 
@@ -384,7 +384,7 @@ IIICredoBMusic = \relative c {
   d,4 r g2-> | \barNumberCheck #30
   c,4 c c'4.-> b8 | % 31
   a4 g f d | % 32
-  c2 c' | % 33
+  c2( c') | % 33
   f, r4 a | % 34
   d,2 d4 f | % 35
   g c, f \breathe a | % 36
@@ -587,7 +587,7 @@ vi -- si -- bi -- li -- um o -- mni -- um et in -- vi -- si -- bi -- li -- um.
 
 Et in u -- num Do -- mi -- num,
 Je -- sum Chri -- stum, fi -- li -- um De -- i u -- ni -- ge -- ni -- tum
-an -- te om - ni -- a sae -- cu -- la.
+an -- te om -- ni -- a sae -- cu -- la.
 
 De -- um de De -- o,
 lu -- men de lu -- mi -- ne,
@@ -617,42 +617,448 @@ Et vi -- tam ven -- tu -- ri sae -- cu -- li.
 A -- men, a -- men, a -- men, a -- men, a -- men, a -- men.
 }
 
-% IIICredoOIaMusic =  {
-% }
-% 
-% IIICredoOIbMusic =  {
-% }
-% 
-% IIICredoODynamics = {
-% }
-% 
-% IIICredoOIIaMusic =  {
-% }
-% 
-% IIICredoOIIbMusic =  {
-% }
-% 
-% 
-% 
-% 
-% 
-% 
-% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %%%                STAVES                 %%%
-% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% 
-% IIICredoOStaff = \context PianoStaff = "IIICredoOSt" \with { instrumentName = "Orgel" shortInstrumentName = "Org." } <<
+IIICredoOIaMusic =  \relative c'' {
+  d2. c4 | % 2
+  b2 a | % 3
+  f2. g4 | % 4
+  a2 r4 a | % 5
+  d2.~ d8[ e] | % 6
+  f2 c4. d8 | % 7
+  e2 cis | % 8
+  d a | % 9
+  gis4. a8 h4. c8 | \barNumberCheck #10
+  <a c,>2 r | % 11
+  R1 | % 12
+  b2. a4 | % 13
+  g2 a | % 14
+  R1*2 | % 16
+  d2( c4 a) | % 17
+  b2 a4 c~ | % 18
+  c c2 c4 | % 19
+  s2 s2 | \barNumberCheck #20
+  b c | % 21
+  b a | % 22
+  h1 | % 23
+  <c e,>2 r | % 24
+  <a f>1 | % 25
+  <b f> | % 26
+  a | % 27
+  d2 c | % 28
+  r f2~ | % 29
+  f d | \barNumberCheck #30
+  g4. f8 e4 d | % 31
+  c2. f4~ | % 32
+  f2 e | % 33
+  f r4 s | % 34
+  d2.( c4) | % 35 % FIXED: d2. instead of d2 d4
+  b2 a | % 36
+  f2. <e g>4 | % 37
+  a2 r4 f4 | % 38
+  <b d,> <a c,> <g b,> <f a,> | % 39
+  d' c b a | \barNumberCheck #40
+  g2^\rit a | % 41
+  f2\fermata r4 f4 \bar "||" % 42
+  \IIICredoSettingsII
+  f2 b4 | % 43
+  b8.[( g16] e4) g | % 44
+  g2 g8[ c] | % 45
+  c8.[ a16] f2 | % 46
+  b4( c d | % 47
+  e <b d>) <d f,> | % 48
+  f2 c4 | % 49
+  d2 c8[ b] | \barNumberCheck #50
+  <a f>2 <g e>4 | % 51
+  <f c>2 r4 | % 52
+  R2. | % 53
+  s2. | % 54
+  ges2( f4) | % 55
+  <f d b>2. | % 56
+  R2.*2 | % 58
+  s2. | % 59
+  a2 g4 | \barNumberCheck #60
+  <g es c>2 r4 | % 61
+  <des' f,>2.~ | % 62
+  des4 c b | % 63
+  <as f> <g e> f | % 64
+  <g e>2\fermata r4 \bar"||" % 65
+  \IIICredoSettingsIII
+  f1 | % 66
+  <g e>2 <a f> | % 67
+  d a | % 68
+  h1 | % 69
+  a | \barNumberCheck #70
+  b2 c | % 71
+  f c | % 72
+  d2. s4 | % 73 % FIXED d2~ d4 => d2.
+  s1*2 | % 75
+  f1 | % 76
+  e2 c | % 77
+  es1 | % 78
+  d2 b~ | % 79
+  b as4 ges | \barNumberCheck #80
+  ges2.( f4) | % 81
+  f2 f | % 82
+  d'2. c4 | % 83
+  b2 a | % 84
+  f2. <g e>4 | % 85
+  <a f>2 r4 a | % 86
+  d2. <e g,>4 | % 87
+  f2 c | % 88
+  e cis | % 89
+  d a | \barNumberCheck #90 
+  d h | % 91
+  c2. b4 | % 92
+  a2 b4 d | % 93
+  f2 e | % 94
+  <a, f> <f d> | % 95
+  b2 a | % 96
+  d b | % 97
+  es d | % 98
+  r r4 s | % 99
+  s2. g,4 | \barNumberCheck #100
+  g' f e d | % 101
+  c2 e4 f | % 102
+  g2 e | % 103
+  f r | % 104
+  <f d b>\breve | \barNumberCheck #106
+  <c a>\fermata \bar "|."
+}
+
+IIICredoOIbMusic = \relative c' {
+  f1~ | % 2
+  f4 e f2 | % 3
+  f2. e4 | % 4
+  f2 r4 a | % 5
+  f2.~ f8[ g] | % 6
+  f1 | % 7
+  e | % 8
+  d2. dis4 | % 9
+  e2 g | \barNumberCheck #10
+  s2 r2 | % 11
+  R1 | % 12
+  d4 e f2~ | % 13
+  f4 e f2 | % 14
+  R1*2 | % 16
+  d4 e f2~ | % 17
+  f4 e f r | % 18
+  e2 f4 a | % 19
+  <b d>2 \voiceOne < c f,~ >2 | \barNumberCheck #20
+  \voiceTwo f,4 e8[ d] e2 | % 21
+  f1 | % 22
+  <f d> | % 23
+  s2 r | % 24
+  c1 | % 25
+  d4 b c2 | % 26
+  f1 | % 27
+  <f d>4 <g e> <a f>2 | % 28
+  <a f>1~ | % 29
+  <a d,>2 <b g>4. <a f>8 | \barNumberCheck #30
+  \voiceThree g2. \voiceTwo f8[ e] | % 31
+  f4 b a f | % 32
+  g2 b | % 33
+  a r4 a | % 34
+  f1 | % 35
+  f4 e f2 | % 36
+  s1 | % 37
+  f2 r4 a,4 | % 38
+  s1 | % 39
+  d2 e4 f~ | \barNumberCheck #40
+  f2 e | % 41
+  s2 r4 s \bar "||"  % 42
+  \IIICredoSettingsII
+  d2. | % 43
+  es2 f4 | % 44
+  es2 e4 | % 45
+  f2 <c a>8[ <c es>] | % 46
+  <d b>4 f2 | % 47
+  b8.[ c16] s4 s | % 48
+  f,2.~ | % 49
+  f4 fis g | \barNumberCheck #50
+  s2. | % 51
+  s2 r4 | % 52
+  R2. | % 53
+  s2. | % 54
+  \voiceThree es2. | % 55
+  s2. | % 57
+  R2.*2 | % 58
+  s2. | % 59
+  f2. | \barNumberCheck #60
+  \voiceTwo s2 r4 | % 61
+  s2. | % 62
+  e2. | % 63
+  s2 f4 | % 64
+  s2 r4 \bar "||" % 65
+  f2. d4 | % 66
+  s1 | % 67
+  f2 a | % 68
+  e1 | % 69
+  a2. f4 | \barNumberCheck #70
+  f1 | % 71
+  f | % 72
+  f2. b4 | % 73
+  <g es'>2. a4 | % 74
+  <b d>2. <g e'>4 | % 75
+  f2. g4 | % 76
+  g2 e4 g | % 77
+  f4. g8 a2 | % 78
+  b f | % 79
+  ges f4 es | \barNumberCheck #80
+  es2 des | % 81
+  c2 s | % 82
+  f1~ | % 83
+  f4 e f2 | % 84
+  s1 | % 85
+  s2 r4 s4 | % 86
+  s1 | % 87
+  f | % 88
+  e | % 89
+  d | \barNumberCheck #90
+  d | % 91
+  c2 e | % 92
+  f2. f8[ g] | % 93
+  <a f>2 <g c,> | % 94
+  s1 | % 95
+  d4. e8 f2 | % 96
+  f b4 g | % 97
+  g2 f | % 98
+  r r4 c | % 99
+  b' a g f | \barNumberCheck #100
+  g1~ | % 101 % FIXED: g2 s2 => g1~
+  g4( a b a) | % 102
+  g1 | % 103
+  a | % 104
+  f\breve | % 105
+  f \bar "|."
+}
+
+IIICredoODynamics = {
+}
+
+IIICredoOIIaMusic = \relative c' {
+  a1 | % 2
+  b2 c | % 3
+  s c | % 4
+  c r4 a | % 5
+  s2 d4. des8 | % 6  % FIXED: des4 => des8
+  s1 | % 6
+  s1 | % 7
+  a1 | % 8
+  h4. c8 d4. e8 | \barNumberCheck #10
+  s1 | % 11
+  s1 | % 12
+  s1 | % 13
+  b2 a | % 14
+  s1*2 | % 16
+  r2 c2~ | % 17
+  c2~ c4 r | % 18
+  b c8[ b] a4 f | % 19
+  b2 a | \barNumberCheck #20
+  g c | % 21
+  c1 | % 22
+  s1 | % 23
+  g2 s | % 24
+  s1*6 | \barNumberCheck #30
+  \change Staff=IIICredoOISt \voiceFour e'4 d c2 | % 31
+  \change Staff=IIICredoOIISt \voiceOne c4 e f h, | % 32
+  c1 | % 33
+  c2 r4 a | % 34
+  a1 | % 35
+  b2 c | % 36
+  s c | % 37
+  c r | % 38
+  r r4 s | % 39
+  b2 c | \barNumberCheck #40
+  c2. b4 | % 41
+  s2 r4 s \bar "||" % 42
+  \IIICredoSettingsII
+  f4( b as) | % 43
+  g8.[ b16] g4 h | % 44
+  g c b | % 45
+  a8.[ c16] a4 s4 | % 46
+  s4 \change Staff=IIICredoOISt \voiceFour a4 b | % 47
+  \change Staff=IIICredoOIISt \voiceOne g8.[ a16] b4 s | % 48
+  c8[ d] es2 | % 49
+  d2. | \barNumberCheck #50
+  c2 b4 | % 51
+  a2 s4 | % 52 % TODO: Add \oneVoice in the BASS!
+  s2. | % 53
+  \change Staff=IIICredoOISt <b des f>2._~ | % 54
+  \voiceFour b4 a2 \voiceOne | % 55
+  s2.*3 | % 58
+  <c es g>2._~ | % 59
+  \voiceFour c4 h2 | \barNumberCheck #60
+  \change Staff=IIICredoOIISt \voiceOne s2. | % 61
+  s2 as4~ | % 62
+  as2 g4 | % 63
+  f4 g as | % 64
+  c2 r4 \bar "||" % 65
+  \IIICredoSettingsIII
+  a1 | % 66
+  c | % 67
+  a | % 68
+  gis | % 69
+  a2 c | \barNumberCheck #70
+  d c | % 71
+  a1 | % 72
+  b2. r4 | % 73
+  r2 r4 s | % 74
+  s1*2 | % 76
+  s2. c4 | % 77
+  f2 c | % 78
+  r4 s2. | % 79
+  s1 | \barNumberCheck #80
+  b1 | % 81
+  a2 f | % 82
+  b2. a4 | % 83
+  b2 c | % 84
+  s1 | % 85
+  s2 r4 s | % 86
+  s2 d4 des | % 87
+  c1 | % 88
+  s1 | % 89
+  a1 | \barNumberCheck #90
+  s1 | % 91
+  g2. c4 | % 92
+  c2 b4 s | % 93
+  s1*4 | % 97
+  b1 | % 98
+  s1 | % 99
+  r2 r4 d | \barNumberCheck #100
+  e d c b | % 101
+  e f c2 | % 102
+  s2 c | % 103
+  c r | % 104
+  <b f>\breve | % 106
+  f\breve\fermata \bar "|."
+}
+
+IIICredoOIIbMusic = \relative c {
+  d2. f4 | % 2
+  g c, f2 | % 3
+  <b d>2 a4 g | % 4
+  f2 r4 a | % 5
+  <a d,>2 b | % 6
+  <a c>2 <a c> | % 7
+  <gis h> <g b> | % 8
+  fis f | % 9
+  e1 | \barNumberCheck #10
+  a2 a | % 11
+  b a | % 12
+  <g b> <f c'> | % 13
+  b,4 c f a~ | % 14
+  a a2 a4 | % 15
+  d2 c | % 16
+  b4 c8[ b] a4 f | % 17
+  g2 f | % 18
+  R1*3 | \barNumberCheck #21
+  f2. e4 | % 22
+  d f e b | % 23
+  c \oneVoice b' a g | % 24
+  f1 | % 25
+  b,4( d) f2 | % 26
+  d'2. c4 | % 27
+  b2 f | % 28
+  r d' | % 29
+  d,4 r g2 | \barNumberCheck #30
+  c,4 c c'4. b8 | % 31
+  \voiceTwo a4 g f d | % 32
+  c2 c' | % 33
+  f, r4 a | % 34
+  d,2. f4 | % 35
+  g c, f a | % 36
+  <b d>2 a4 g | % 37
+  f2 r | % 38
+  r r4 f4 | % 39
+  b a g a8[ b] | \barNumberCheck #40
+  c2 c, | % 41
+  <f a>2\fermata r4 f4 \bar "||" % 42
+  \IIICredoSettingsII
+  b,2. | % 43
+  e2 d4 | % 44
+  c2. | % 45
+  f | % 46
+  R | % 47
+  s2 <b d>4 | % 48
+  a2. | % 49
+  b4 a g | \barNumberCheck #50
+  c,2. | % 51
+  f4 a2 | % 52
+  \oneVoice b2 b,4 | % 53
+  R2.*2 | % 55
+  r2 b'4 | % 56
+  h2. | % 57
+  c2 c,4 | % 58
+  R2.*2 | \barNumberCheck #60
+  r4 c' c, | % 61
+  <b b'>2 \voiceTwo r4 | % 62
+  r c2 | % 63
+  des2. | % 64
+  c2\fermata r4 \bar "||"  % 65
+  \IIICredoSettingsIII
+  f2 d | % 66
+  c f | % 67
+  d f | % 68
+  e1 | % 69
+  a2 f | \barNumberCheck #70
+  <b d> <a c> | % 71
+  d, f | % 72
+  <b b,>2. r4 | % 73
+  r2 r4 f4 | % 74
+  <b d>2. <b des>4 | % 75
+  <a c>2. <h c>4 | % 76
+  <c e>2. b4 | % 77
+  a4. g8 f2 | % 78
+  r4 <b d>2 <b d>4 | % 79
+  es2 <b es,>2 | \barNumberCheck #80
+  e,1 | % 81
+  f2 f | % 82
+  b,4( d) f2 | % 83
+  g4 c, f2 | % 84
+  <b d>2 <a c>4 <g b> | % 85
+  <f c'>2 r4 a4 | % 86
+  <a d,>2 b | % 87
+  a1 | % 88
+  <gis h>2 <g b> | % 89
+  fis1 | \barNumberCheck #90
+  <f as>2~ <f g> | % 91
+  e2 c | % 92
+  f4 es d \oneVoice b' | % 93
+  c2 c, | % 94
+  R1 | % 95
+  r2 r4 f | % 96
+  <b d>2 g | % 97
+  \voiceTwo es2 b4 f' | % 98
+  d' c b a | % 
+  g f e d | \barNumberCheck #100
+  c2. d4 | % 101
+  b' a g f | % 102
+  <b d>2 c | % 103
+  f, r | % 104
+  b,\breve | % 106
+  f  \bar "|."
+}
+
+
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%                STAVES                 %%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+IIICredoOStaff = \context PianoStaff = "IIICredoOSt" \with { instrumentName = "Orgel" shortInstrumentName = "Org." } <<
 %   \context Staff = "IIICredoOISt" {\IIICredoCueLabels}
-%   \context Staff = "IIICredoOISt" << 
-%     \OIClef
-%     \context Voice = "IIICredoOIa" { \voiceOne \IIICredoKey\IIICredoSettings\IIICredoOIaMusic }
-%     \context Voice = "IIICredoOIb" { \voiceTwo \IIICredoKey\IIICredoSettings\IIICredoOIbMusic }
-%     \context Voice = "IKyrieODynamics" { \IIICredoSettings\dynamicDown\IIICredoODynamics }
-%   >> 
-% %   \context Dynamics = "IIICredoODynamics" { \IIICredoODynamics }
-%   \context Staff = "IIICredoOIISt" <<
-%     \OIIClef
-%     \context Voice = "IIICredoOIIa" { \voiceOne \IIICredoKey\IIICredoSettings\IIICredoOIIaMusic }
-%     \context Voice = "IIICredoOIIb" { \voiceTwo \IIICredoKey\IIICredoSettings\IIICredoOIIbMusic }
-%   >>
-% >>
+  \context Staff = "IIICredoOISt" << 
+    \OIClef
+    \context Voice = "IIICredoOIa" { \voiceOne \IIICredoKey\IIICredoSettings\IIICredoOIaMusic }
+    \context Voice = "IIICredoOIb" { \voiceTwo \IIICredoKey\IIICredoSettings\IIICredoOIbMusic }
+    \context Voice = "IIICredoODynamics" { \IIICredoSettings\dynamicDown\IIICredoODynamics }
+  >> 
+%   \context Dynamics = "IIICredoODynamics" { \IIICredoODynamics }
+  \context Staff = "IIICredoOIISt" <<
+    \OIIClef
+    \context Voice = "IIICredoOIIa" { \voiceOne \IIICredoKey\IIICredoSettings\IIICredoOIIaMusic }
+    \context Voice = "IIICredoOIIb" { \voiceTwo \IIICredoKey\IIICredoSettings\IIICredoOIIbMusic }
+  >>
+>>
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_04_Sanctus.ly b/Pembaur_ErsteLateinischeMesse_Es-Dur_04_Sanctus.ly
index 69a54a12128027fa0ea0a3730bd335a6432a6d4e..7f74889465490c73067effaad33bd0d2a294ddcc 100644
--- a/Pembaur_ErsteLateinischeMesse_Es-Dur_04_Sanctus.ly
+++ b/Pembaur_ErsteLateinischeMesse_Es-Dur_04_Sanctus.ly
@@ -26,9 +26,9 @@ IVSanctusSMusic = \relative c'' {
 %     \\
     \new Voice ="IVSanctusSII" {\voiceTwo f4( ges4. f8) | % 2
     f2 r4 | % 3
-    f4( ges2) | % 4
+    f4 ges2 | % 4
     f2 r4 | % 5
-    f4( ges2) | % 6
+    f4 ges2 | % 6
     f2 }
   >> \oneVoice as4~\p\< | % 7
   as2 as8 as\! | % 8
@@ -70,25 +70,25 @@ IVSanctusAMusic = \relative c' {
   ges4\f( b) as | \barNumberCheck #10
   as2. | % 11
   f8[ g] as4 g | % 12
-  as( g) f |
-  g2\> es4\! |
+  as( g) f | % 13
+  g2\> es4\! | % 14
   es2 r4 | % 15
-  f4^\ppmosso f as |
-  ges ges f |
-  c'2 b4 |
-  as4. as8 es4 |
+  f4^\ppmosso f as | % 16
+  ges ges f | % 17
+  c'2 b4 | % 18
+  as4. as8 es4 | % 19
   f2( g4) | \barNumberCheck #20
-  a2 r4 |
-  R2. |
-  b4. b8 b4 |
-  es,2 es4 |
-  as4. as8 as4 |
-  as as f |
-  ges as b8 b |
-  as4( g ges) |
-  f b^\rit b |
-  as2.~( |
-  as2 \breathe g4) |
+  as2 r4 | % 21
+  R2. | % 22
+  b4. b8 b4 | % 23
+  es,2 es4 | % 24
+  as4. as8 as4 | % 25
+  as as f | % 26
+  ges as b8 b | % 27
+  as4( g ges) | % 28
+  f b^\rit b | % 29
+  as2.~( | \barNumberCheck #30
+  as2 \breathe g4) | % 31
   f2\fermata r4 \bar"|."
 }
 
@@ -124,7 +124,7 @@ IVSanctusBMusic = \relative c {
   R2.*6 | % 7
   c2\p\< des8 c | % 8
   des2\! des'4 | % 9
-  b(\f g) des | \barNumberCheck #10
+  b(\f ges) des | \barNumberCheck #10
   as'2. | % 11
   b4 as es | % 12
   f2 f4 | % 13
@@ -138,7 +138,7 @@ IVSanctusBMusic = \relative c {
   g4. g8 g4 | % 24
   as4 as as | % 25
   des des ces8 ces | % 26
-  b4 as g8 g | % 27
+  b4 as ges8 ges | % 27
   f4 es as | % 28
   b-> ges^\rit ges8 ges | % 29
   as2.( | \barNumberCheck #30
@@ -173,46 +173,155 @@ glo -- ri -- a tu -- a!
 O -- san -- na in ex -- cel -- sis in ex -- cel -- sis, o -- san -- na in ex -- cel -- sis.
 }
 
-% IVSanctusOIaMusic =  \relative g' {
-% }
-% 
-% IVSanctusOIbMusic =  \relative b {
-% }
-%   
-% IVSanctusODynamics = {
-% }
-% 
-% IVSanctusOIIaMusic =  \relative d {
-% }
-% 
-% IVSanctusOIIbMusic =  \relative g, {
-% }
-% 
-% IVSanctusVcBMusic = \relative g, {
-% }
-% 
-% 
-% 
-% 
-% 
-% 
-% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %%%                STAVES                 %%%
-% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% 
-% IVSanctusOStaff = \context PianoStaff = "IVSanctusOSt" \with { instrumentName = "Orgel" shortInstrumentName = "Org." } <<
+IVSanctusOIaMusic =  \relative c'' {
+  \oneVoice <as f>4 <b g>4. <as f>8 | % 2
+  <as f>2 r4 | % 3
+  <as f>4 \voiceOne b4. as8 | % 4
+  as2 r4 | % 5
+  as4 des b | % 6
+  <as f>2 as4~ | % 7
+  as2.~ | % 8
+  as4 c des~ | % 9
+  \oneVoice <des ges,> <ges b,> <f as> | \barNumberCheck #10
+  <es as,>2. | % 11
+  \voiceOne des4 c b | % 12
+  as b c | % 13
+  es2 c4 | % 14
+  c2 r4 | % 15
+  \oneVoice <des f,>2^\ppmosso <c as>4 | % 16
+  <b g>2 <as f>4 | % 17
+  <c es>2 <b des>4 | % 18
+  \voiceOne c2. | % 19
+  d | \barNumberCheck #20
+  <c as>2 \oneVoice r4 | % 21
+  R2. | % 22
+  b2. | % 23
+  <es es,>2. | % 24
+  <c as> | % 25
+  <f as,>2 <d f,>4 | % 26
+  \voiceOne ges4 f es | % 27
+  des2 c4 | % 28
+  d4^\rit es2 | % 29
+  f2. | \barNumberCheck #30
+  es | % 31
+  \oneVoice <d f,>2\fermata r4 \bar"|."
+}
+
+IVSanctusOIbMusic =  \relative c'' {
+  s2.*2 | % 3
+  s4 g2 | % 4
+  f2 r4 | % 5
+  f4 g2 | % 6
+  s2. | % 7
+  es4 ges f8[ es] | % 8
+  f4 \voiceThree as2 \voiceTwo | \barNumberCheck #9
+  s2.*2 | % 11
+  f8[ g] as4 g | % 12
+  as g f | % 13
+  g2 es4 | % 14
+  es2 r4 | % 15
+  s2.*3 | % 18
+  as2 es4 | % 19
+  f2 g4 | \barNumberCheck #20
+  s2.*6 | % 26
+  g4 as b | % 27
+  as g ges | % 28
+  f b2 | % 29
+  as2.~ | \barNumberCheck #30
+  as4. ges8[ f es] | % 31
+  s2. \bar"|."
+}
+  
+IVSanctusODynamics = {
+  s2.\pp | % 2
+  s2.*4 | % 6
+  s2 s4\p | % 7
+  s2.*8 | % 15
+  s2\f s4 | % 16
+  s2.*16 \bar"|." % 32
+}
+
+IVSanctusOIIaMusic =  \relative c' {
+  \oneVoice des2.~ | % 2
+  des2 r4 | % 3
+  <des f>2 <c es>4 | % 4
+  <des f>2 r4 | % 5
+  <des f>4 <b des>4. <c es>8 | % 6
+  \voiceOne des2 as4~ | % 7
+  as es' des8[ as] | % 8
+  as4 \change Staff=IVSanctusOISt \voiceTwo ges' f | % 9
+  \change Staff=IVSanctusOIISt b,4 g d | \barNumberCheck #10
+  \oneVoice <as' c>2. | % 11
+  \voiceOne b4 c des | % 12
+  c b as | % 13
+  b8[ c] des4 c | % 14
+  c2 r4 | % 15
+  \oneVoice R2.*3 | % 18
+  \voiceOne c2 b4 | % 19
+  as2 es'4~ | \barNumberCheck #20
+  es c as | % 21
+  \oneVoice <des f,>2. | % 22
+  \voiceOne b2 es4~ | % 23
+  es b2 | % 24
+  \oneVoice <as c>2. | % 25
+  \voiceOne des2. | % 26
+  des2.~ | % 27
+  des2 es4 | % 28
+  des2.~ | % 29
+  des2.~ | \barNumberCheck #30
+  des4 c8[ b] c4 | % 31
+  des2\fermata r4 \bar "|." % 32
+}
+
+IVSanctusOIIbMusic =  \relative c {
+  s2.*5 | % 6
+  R2. | % 7
+  c2 des8[ c] | % 8
+  des2 des'4~ | % 9
+  \voiceOne des2. | \barNumberCheck #10
+  \voiceTwo s2. | % 11
+  b4 as es | % 12
+  f2 f4 | % 13
+  es2 <es as,>4 | % 14
+  <es as,>2 r4 | % 15
+  s2.*3 | % 18
+  as2 ges4 | % 19
+  f2 es4 | \barNumberCheck #20
+  as2 ges4 | % 21
+  s2. | % 22
+  ges2. | % 23
+  g2. | % 24
+  s2. | % 25
+  des'2 ces4 | % 26
+  b as ges | % 27
+  f es as | % 28
+  b ges2 | % 29
+  as2. | \barNumberCheck #30
+  as, | % 31
+  des2\fermata r4 \bar"|." % 32
+}
+
+
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%                STAVES                 %%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+IVSanctusOStaff = \context PianoStaff = "IVSanctusOSt" \with { instrumentName = "Orgel" shortInstrumentName = "Org." } <<
 %   \context Staff = "IVSanctusOISt" {\IVSanctusCueLabels}
-%   \context Staff = "IVSanctusOISt" << 
-%     \OIClef
-%     \context Voice = "IVSanctusOIa" { \voiceOne \IVSanctusKey\IVSanctusSettings\IVSanctusOIaMusic }
-%     \context Voice = "IVSanctusOIb" { \voiceTwo \IVSanctusKey\IVSanctusSettings\IVSanctusOIbMusic }
-%     \context Voice = "IVSanctusODynamics" { \IVSanctusSettings\dynamicDown\IVSanctusODynamics }
-%   >> 
-% %   \context Dynamics = "IVSanctusODynamics" { \IVSanctusODynamics }
-%   \context Staff = "IVSanctusOIISt" <<
-%     \OIIClef
-%     \context Voice = "IVSanctusOIIa" { \voiceOne \IVSanctusKey\IVSanctusSettings\IVSanctusOIIaMusic }
-%     \context Voice = "IVSanctusOIIb" { \voiceTwo \IVSanctusKey\IVSanctusSettings\IVSanctusOIIbMusic }
-%   >>
-% >>
-% 
\ No newline at end of file
+  \context Staff = "IVSanctusOISt" << 
+    \OIClef
+    \context Voice = "IVSanctusOIa" { \voiceOne \IVSanctusKey\IVSanctusSettings\IVSanctusOIaMusic }
+    \context Voice = "IVSanctusOIb" { \voiceTwo \IVSanctusKey\IVSanctusSettings\IVSanctusOIbMusic }
+    \context Voice = "IVSanctusODynamics" { \IVSanctusSettings\dynamicDown\IVSanctusODynamics }
+  >> 
+%   \context Dynamics = "IVSanctusODynamics" { \IVSanctusODynamics }
+  \context Staff = "IVSanctusOIISt" <<
+    \OIIClef
+    \context Voice = "IVSanctusOIIa" { \voiceOne \IVSanctusKey\IVSanctusSettings\IVSanctusOIIaMusic }
+    \context Voice = "IVSanctusOIIb" { \voiceTwo \IVSanctusKey\IVSanctusSettings\IVSanctusOIIbMusic }
+  >>
+>>
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_05_Benedictus.ly b/Pembaur_ErsteLateinischeMesse_Es-Dur_05_Benedictus.ly
index 43463190c6d90f9e47861ea923b27e47e2f2d93b..2e087acc7677288552fd968c9a67b7d4ad35f586 100644
--- a/Pembaur_ErsteLateinischeMesse_Es-Dur_05_Benedictus.ly
+++ b/Pembaur_ErsteLateinischeMesse_Es-Dur_05_Benedictus.ly
@@ -59,16 +59,16 @@ VBenedictusSMusic = \relative c' {
 VBenedictusAMusic = \relative c' {
   r4 | % 1
   R2.*2 | % 3
-  r2 \cueText "Solo" c8 d | % 4
+  r2 \cueText "Solo" c8\p d | % 4
   es4-> es es | % 5
   f f f\< | % 6
-  g8[ b]\! a g\> f es16[\! des] | % 7
-  c4 r c8[ a'] | % 8
-  a4-> g g | % 9
-  a g8 f es f | \barNumberCheck #10
+  g8[ b]\! as g\> f es16[\! des] | % 7
+  c4 r c8[ as'] | % 8
+  as4-> g g | % 9
+  as g8 f es f | \barNumberCheck #10
   g2 g4 | % 11
   as4-> as c8[ b] | % 12
-  b[ e,] f g as d, | % 13
+  b[ e,] f g as des, | % 13
   es4 r as8. as16 | % 14
   g4 g b | % 15
   b b h\f | % 16
@@ -100,7 +100,7 @@ VBenedictusTMusic = \relative c {
   r2 \cueText "Solo" f8\p g | % 7
   as4-> as as | % 8
   b c h8[\< c] | % 9
-  d[ f]\! es des c b16[ as] | \barNumberCheck #10
+  d[ f]\! es d c b16[ as] | \barNumberCheck #10
   g2 g8[( es')] | % 11
   es4 d d | % 12
   es8[ des] c b as as | % 13
@@ -118,7 +118,7 @@ VBenedictusTMusic = \relative c {
   b2 as8 g | % 25
   b8. b16 b4 es\p | % 26
   des c es | % 27
-  des8[\< c des f\!] a8\> f| % 28
+  des8[\< c des f\!] as8\> f\! | % 28
   es2 d4 | % 29
   c2 \cueText "Tutti" as4 | \barNumberCheck #30
   as2.~ | % 31
@@ -132,7 +132,7 @@ VBenedictusTMusic = \relative c {
 VBenedictusBMusic = \relative c {
   r4 | % 1
   R2.*8 | % 9
-  r2 \cueText "Solo" c8 d | \barNumberCheck #10
+  r2 \cueText "Solo" c8\p d | \barNumberCheck #10
   es4-> es es | % 11
   f-> f f\< | % 12
   g8[ b] as\! g\> f f\! | % 13
@@ -204,46 +204,183 @@ qui ve -- nit in no -- mi -- ne Do -- mi -- ni,
 o -- san -- na in ex -- cel -- sis in ex -- cel -- sis.
 }
 
-% VBenedictusOIaMusic =  \relative a' {
-% }
-% 
-% VBenedictusOIbMusic =  \relative f' {
-% }
-%   
-% 
-% VBenedictusODynamics = {
-% }
-% 
-% VBenedictusOIIaMusic =  \relative c' {
-% }
-% 
-% VBenedictusOIIbMusic =  \relative f {
-% }
-% 
-% VBenedictusVcBMusic = \relative f {
-% }
-% 
-% 
-% 
-% 
-% 
-% 
-% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %%%                STAVES                 %%%
-% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% 
-% VBenedictusOStaff = \context PianoStaff = "VBenedictusOSt" \with { instrumentName = "Orgel" shortInstrumentName = "Org." } <<
+VBenedictusOIaMusic =  \relative c' {
+  \oneVoice es8[ g] | % 1
+  as2. | % 2
+  b2 b8[ c] | % 3
+  des[ f es d] c[ b16 as] | % 4
+  \voiceOne g4 r g8[ es'] | % 5
+  es4 d2 | % 6
+  es8[ des c b] as8.[ b16] | % 7
+  c2. | % 8
+  d4 es d8[ es] | % 9
+  f8[ d] es4.( b8) | \barNumberCheck #10
+  b2. | % 11
+  r4 r r8 b | % 12
+  es[ g f es] d[ c16 b] | % 13
+  b4 r c8.[ b16] | % 14
+  b2 d4 | % 15
+  f es g~ | % 16
+  g as8[ g f es] | % 17
+  b2.~ | % 18
+  b2 r4 | % 19
+  R2. | \barNumberCheck #20
+  r4 r \oneVoice des,8.[ b16] | % 21
+  \voiceOne r4 r g'8.[ f16] | % 22
+  b2. | % 23
+  c | % 24
+  d4 b8[ c d es] | % 25
+  f8.[ des16] b4 b( | % 26
+  h) c c | % 27
+  des8[( es f as f des]) | % 28
+  c2( b4) | % 29
+  as2 as4 | \barNumberCheck #30
+  des4 c b | % 31
+  es d des^\rit | % 32
+  c b2 | % 33
+  c2. | % 34
+  b | % 35
+  as2\fermata \bar "|."
+}
+
+VBenedictusOIbMusic =  \relative c' {
+  s4 | % 1
+  s2.*2 | % 3
+  s2 \change Staff=VBenedictusOIISt c8[( d] | % 4
+  \change Staff=VBenedictusOISt es2.) | % 5
+  f | % 6
+  g8[ b as g] f[ es16 des] | % 7
+  c4 r c8[( as']) | % 8
+  as4 g2 | % 9
+  as4 g8[ f es f] | \barNumberCheck #10
+  g2 g4 | % 11
+  as2 c8[ b] | % 12
+  b[ e, f g as d,] | % 13
+  es4 r as | % 14
+  g2 b4 | % 15
+  b2 h4 | % 16
+  c2 f,4 | % 17
+  g8[ f16 es] d2 | % 18
+  es2 r4 | % 19
+  s2.*2 | \barNumberCheck #21
+  es2. | % 22
+  d2 e4 | % 23
+  f2 es4 | % 24
+  d es f8[ g] | % 25
+  as8.[ f16] d4 es | % 26
+  es2 as4 | % 27
+  as2 as8[ b] | % 28
+  as4 g f8[ g] | % 29
+  s2. | \barNumberCheck #30
+  des4 es f | % 31
+  as2 g4 | % 32
+  as4 f2 | % 33
+  as2.~ | % 34
+  as4 g2 | % 35
+  as2 \bar "|."
+}
+  
+
+VBenedictusODynamics = {
+  s4\p | % 1
+  s2.*25 | % 26
+  s2.*3 | \barNumberCheck #29
+  s2 s4\f | \barNumberCheck #30
+  s2.*5 | % 35
+  s2 \bar "|."
+}
+
+VBenedictusOIIaMusic =  \relative c {
+  \oneVoice r4 | % 1
+  R2.*2 | % 3
+  r4 r4 s | % 4
+  R2.*2 | % 6
+  r4 r \voiceOne f8[ g] | % 7
+  as2. | % 8
+  b4 c h8[ c] | % 9
+  d8[ f es d] c[ b16 as] | \barNumberCheck #10
+  g2 g8[ es'] | % 11
+  es4 d2 | % 12
+  es8[ des c b] as4 | % 13
+  b4 b2~ | % 14
+  b4( es) f | % 15
+  b, es des | % 16
+  c4. es8[ d c] | % 17
+  es8[ des16 c] b4. as8 | % 18
+  g2 s4 | % 19
+  r r as8.[ f16] | \barNumberCheck #20
+  b2. | % 21
+  b2 c4 | % 22
+  d2 c8[ b] | % 23
+  a2. | % 24
+  b2.~ | % 25
+  b2 \oneVoice <es g,>4( | % 26
+  <des g,>) <c as> <es ges,> | % 27
+  \voiceOne des8[ c des f] as[ f] | % 28
+  es2 des4 | % 
+  c2 s4 | \barNumberCheck #30
+  as2.~ | % 31
+  as4 as4( b | % 32
+  as2.)~ | % 33
+  as4.( b8[ c des]) | % 34
+  es2 des4 | % 35
+  c2 \bar "|."
+}
+
+VBenedictusOIIbMusic =  \relative c {
+  s4 | % 1
+  s2.*6 | % 7
+  R2.*2 | % 9
+  r4 r c8[ h] | \barNumberCheck #10
+  es2. | % 11
+  f | % 12
+  g8[ b as g] f4 | % 13
+  g r d | % 14
+  es2 as4 | % 15
+  g2 f4 | % 16
+  e f8[ g] as4 | % 17
+  b2 b,4 | % 18
+  es2 es8.[ d16] | % 19
+  f2 s4 | \barNumberCheck #20
+  g2 as4 | % 21
+  g2 f4 | % 22
+  b,4 g'2 | % 23
+  f2. | % 24
+  b8[ as g f] f[ es] | % 25
+  d8.[ f16] as4 s | % 26
+  s2. | % 27
+  f8[ es] des2 | % 28
+  es2. | % 29
+  as2 as4 | \barNumberCheck #30
+  f es des | % 31
+  c b es | % 32
+  f des2 | % 33
+  es2.~ | % 34
+  es | % 35
+  as,2\fermata \bar"|."
+}
+
+
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%                STAVES                 %%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+VBenedictusOStaff = \context PianoStaff = "VBenedictusOSt" \with { instrumentName = "Orgel" shortInstrumentName = "Org." } <<
 %   \context Staff = "VBenedictusOISt" {\VBenedictusCueLabels}
-%   \context Staff = "VBenedictusOISt" << 
-%     \OIClef
-%     \context Voice = "VBenedictusOIa" { \voiceOne \VBenedictusKey\VBenedictusSettings\VBenedictusOIaMusic }
-%     \context Voice = "VBenedictusOIb" { \voiceTwo \VBenedictusKey\VBenedictusSettings\VBenedictusOIbMusic }
-%     \context Voice = "VBenedictusODynamics" { \VBenedictusSettings\dynamicDown\VBenedictusODynamics }
-%   >> 
-% %   \context Dynamics = "VBenedictusODynamics" { \VBenedictusSettings\VBenedictusODynamics }
-%   \context Staff = "VBenedictusOIISt" <<
-%     \OIIClef
-%     \context Voice = "VBenedictusOIIa" { \voiceOne \VBenedictusKey\VBenedictusSettings\VBenedictusOIIaMusic }
-%     \context Voice = "VBenedictusOIIb" { \voiceTwo \VBenedictusKey\VBenedictusSettings\VBenedictusOIIbMusic }
-%   >>
-% >>
+  \context Staff = "VBenedictusOISt" << 
+    \OIClef
+    \context Voice = "VBenedictusOIa" { \voiceOne \VBenedictusKey\VBenedictusSettings\VBenedictusOIaMusic }
+    \context Voice = "VBenedictusOIb" { \voiceTwo \VBenedictusKey\VBenedictusSettings\VBenedictusOIbMusic }
+    \context Voice = "VBenedictusODynamics" { \VBenedictusSettings\dynamicDown\VBenedictusODynamics }
+  >> 
+%   \context Dynamics = "VBenedictusODynamics" { \VBenedictusSettings\VBenedictusODynamics }
+  \context Staff = "VBenedictusOIISt" <<
+    \OIIClef
+    \context Voice = "VBenedictusOIIa" { \voiceOne \VBenedictusKey\VBenedictusSettings\VBenedictusOIIaMusic }
+    \context Voice = "VBenedictusOIIb" { \voiceTwo \VBenedictusKey\VBenedictusSettings\VBenedictusOIIbMusic }
+  >>
+>>
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_06_Agnus.ly b/Pembaur_ErsteLateinischeMesse_Es-Dur_06_Agnus.ly
index aad482ada457158942899c01a6b4446fc2cb42d2..08f8617b89ce58fa4c42945349ade51959661320 100644
--- a/Pembaur_ErsteLateinischeMesse_Es-Dur_06_Agnus.ly
+++ b/Pembaur_ErsteLateinischeMesse_Es-Dur_06_Agnus.ly
@@ -58,7 +58,7 @@ VIAgnusSMusic = \relative c'' {
   des2 c4 \breathe es4 | % 42
   g,2(\> f) | % 43
   es1\! | % 44
-  as4. es8 es4~ es8 f | % 45
+  as4. es8 es4. f8 | % 45
   g1\< | % 46
   g2\>\fermata r2\! \bar "|."
 }
@@ -151,7 +151,7 @@ VIAgnusTMusic = \relative c' {
   es2) es4 c | % 42
   b2. as4 | % 43
   g4. g8 g4( as8) b | % 44
-  c2( des | % 45
+  c2( ces | % 45
   b1)\< | % 46 % TODO: make cresc+decresc consistent
   b2\!\>\fermata r\! \bar"|."
 }
@@ -262,45 +262,227 @@ do -- na no -- bis pa -- cem, da pa -- cem, da pa -- cem, da pa -- cem,
 do -- na pa -- cem.
 }
 
-% VIAgnusOIaMusic =  \relative g' {
-% }
-% 
-% VIAgnusOIbMusic =  \relative g {
-% }
-%   
-% VIAgnusODynamics = {
-% }
-% 
-% VIAgnusOIIaMusic =  \relative es {
-% }
-% 
-% VIAgnusOIIbMusic =  \relative c {
-% }
-% 
-% VIAgnusVcBMusic = \relative c {
-% }
-% 
-% 
-% 
-% 
-% 
-% 
-% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %%%                STAVES                 %%%
-% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% 
-% VIAgnusOStaff = \context PianoStaff = "VIAgnusOSt" \with { instrumentName = "Orgel" shortInstrumentName = "Org." } <<
+VIAgnusOIaMusic =  \relative c'' {
+  g1 | % 2
+  as4.( f8) f4 as | % 3
+  c4.( g8) g4 c,~ | % 4
+  \voiceTwo c4. d8 \voiceOne es4 d | % 5
+  s1 | % 6
+  r4 g2 c4 | % 7
+  c2~ c4 r | % 8
+  r \oneVoice <g es>2 <es' es,>4 | % 9
+  \voiceOne d1 | \barNumberCheck #10
+  R | % 11
+  d2. c4 | % 12
+  b2 a | % 13
+  g r | % 14
+  \oneVoice r4 b2 es4 | % 15
+  \voiceOne c2 b4 r | % 16
+  r d4( es c) | % 17
+  c2 h | % 18
+  c,4 es f4. g8 | % 19
+  f'2. f8[ es] | \barNumberCheck #20
+  es2 d | % 21
+  c r | % 22
+  r4 es2 b4 | % 23
+  c4 as b2 | % 24
+  g'4 es8[ d] c4 b | % 25
+  b4. c8 as4 r | % 26
+  \oneVoice r2 r4 <as es>4 | % 27
+  <as f>2. <g es>4 | % 28
+  \voiceOne g2 f | % 29
+  g2\fermata << s2 \new CueVoice { \cueText "Corni" <g g,>4 <g g,> } >> | \barNumberCheck #30
+  \VIAgnusSettingsII
+  g4.( es8) es4 g | % 31
+  g2 f4 r | % 32
+  as4.( b8) g4 b~ | % 33
+  b4.( c8) as4 r | % 34
+  c2 b | % 35
+  es d4. es8 | % 36
+  f1 | % 37
+  d2 r | % 38
+  R1 | % 39
+  b2 r | \barNumberCheck #40
+  es2 b4 c8[ des] | % 41
+  des2 c4 es | % 42
+  g,2 f | % 43
+  es b4 c8[ des] | % 44
+  as'2 es4. f8 | % 45
+  \oneVoice <g~ es~>1 | % 46
+  <g es>2\fermata r \bar"|."
+}
+
+VIAgnusOIbMusic =  \relative c' {
+  es2 c~ | % 2
+  c2. f4 | % 3
+  s1 | % 4
+  \voiceOne f2 \voiceTwo h, | % 5
+  es c | % 6
+  r4 es2. | % 7
+  es2~ es4 r | % 8
+  s1 | % 9
+  g2 fis | \barNumberCheck #10
+  g2. fis4 | % 11
+  fis2 g | % 12
+  g fis | % 13
+  g2. es4 | % 14
+  s1 | % 15
+  es2. d8[ c] | % 16
+  h2 c | % 17
+  es2. d4 | % 18
+  c2. b4 | % 19
+  as'2 g | \barNumberCheck #20
+  as2. g8[ f] | % 21
+  es2 r | % 22
+  r4 g2. | % 23
+  es4 c es as | % 24
+  g4. f8 es8[ f] g4 | % 25
+  g2 f4 r | % 26
+  s1*2 | % 28
+  es2. d4 | % 29
+  d1 | \barNumberCheck #30
+  s1 | % 31
+  es2 es4 es4~ | % 32
+  es d es g | % 33
+  g2 f4 f~ | % 34
+  f2 g4 as | % 35
+  g2 fis4 g | % 36
+  as c b as | % 37
+  b1 | % 38
+  es,2 c4 d8[ es] | % 39
+  d2 f4 es8[ f] | \barNumberCheck #40
+  g1~ | % 41
+  g4 as8[ b] as4 es | % 42
+  es2. d4 | % 43
+  s1 | % 44
+  c2 ces | % 45
+  s1*2 \bar"|."
+}
+  
+VIAgnusODynamics = {
+  s1*25 | % 26
+  s2 s4 s4\p | % 27
+  s1*12 | % 39
+  s4\p s2 s4 | \barNumberCheck #40 % TODO: \p only in left hand???
+  s1*7 \bar"|."
+}
+
+VIAgnusOIIaMusic =  \relative c' {
+  g2 es | % 2
+  f4 as c2~ | % 3
+  c2. g4 | % 4
+  as2 g | % 5
+  g r | % 6
+  g1 | % 7
+  c2. b8[ as] | % 8
+  g1 | % 9
+  b2.( a4) | \barNumberCheck #10
+  g2 a4. b8 | % 11
+  c2 b4 c | % 12
+  d2. c4 | % 13
+  b2 r | % 14
+  b1 | % 15
+  as2 g4 r | % 16
+  r g2 as4~ | % 17
+  as2 g | % 18
+  r4 s2. | % 19
+  b2. c4~ | \barNumberCheck #20
+  c d8[ c] h2 | % 21
+  c1 | % 22
+  r4 b2 es4 | % 23
+  es2. b4 | % 24
+  b2 c8[ d] es4 | % 25
+  des4 c c r | % 26
+  r2 r4 ces | % 27
+  s1*2 | % 29
+  h2 r | \barNumberCheck #30
+  b2. b8[ h] | % 31
+  c2~ c4 r | % 32
+  r b2 es4 | % 33
+  des c c r | % 34
+  c d es b~ | % 35
+  b a2 b4 | % 36
+  c es d c | % 37
+  d2 s2 | % 39
+  s1*2 | \barNumberCheck #40
+  b4. c8 des4 c8[ b] | % 41
+  es2. c4 | % 42
+  b2. as4 | % 43
+  g2. as8[ b] | % 44
+  s1 | % 45
+  s1 | % 46
+  s2 r \bar "|."
+}
+
+VIAgnusOIIbMusic =  \relative c {
+  c1~ | % 2
+  c2 as'4 f | % 3
+  es1 | % 4
+  d2 g, | % 5
+  c r | % 6
+  r4 c2. | % 7
+  c2~ c4 r | % 8 % TODO: Write this as c2.???
+  r4 c2. | % 9
+  b4 c d2 | \barNumberCheck #10
+  es d | % 11
+  d es | % 12
+  d4 c d2 | % 13
+  g r | % 14
+  r4 <g es>2 s4 | % 15 % TODO: what about the s4???
+  as,4 c es r | % 16
+  r g c, as'~ | % 17
+  as f g2 | % 18
+  r4 c,4 d2~ | % 19
+  d es | \barNumberCheck #20
+  f g | % 21
+  c,4 c'2 as4 | % 22
+  es1 | % 23
+  as2 g4 f | % 24
+  es2 as4 es | % 25
+  e2 f4 f~ | % 26
+  f f2 es4 | % 27
+  <d b'>2 es | % 
+  <as c>1 | % 
+  g1\fermata | \barNumberCheck #30
+  es4. g8 g2 | % 31 % FIXED: g4 => g8
+  as2~ as4 r | % 32
+  f2 es | % 33
+  e f4 r | % 34
+  as2 g4 f | % 35
+  es c d g | % 36
+  f1 | % 37
+  b2 f4 \oneVoice g8[ as] | % 38
+  g4 es as f | % 39
+  b as2 g8[ f] | \barNumberCheck #40
+  \voiceTwo es1~ | % 41
+  es4 f8[ g] as4 a | % 42
+  b2 b, | % 43
+  es1~ | % 44
+  \oneVoice
+  es1 | % 45
+  <es~ b'~>1 | % 46
+  <es b'>2\fermata r2 \bar"|."
+}
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%                STAVES                 %%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+VIAgnusOStaff = \context PianoStaff = "VIAgnusOSt" \with { instrumentName = "Orgel" shortInstrumentName = "Org." } <<
 %   \context Staff = "VIAgnusOISt" {\VIAgnusCueLabels}
-%   \context Staff = "VIAgnusOISt" << 
-%     \OIClef
-%     \context Voice = "VIAgnusOIa" { \voiceOne \VIAgnusKey\VIAgnusSettings\VIAgnusOIaMusic }
-%     \context Voice = "VIAgnusOIb" { \voiceTwo \VIAgnusKey\VIAgnusSettings\VIAgnusOIbMusic }
-%     \context Voice = "VIAgnusODynamics" { \VIAgnusSettings\dynamicDown\VIAgnusODynamics }
-%   >> 
-% %   \context Dynamics = "VIAgnusODynamics" { \VIAgnusODynamics }
-%   \context Staff = "VIAgnusOIISt" <<
-%     \OIIClef
-%     \context Voice = "VIAgnusOIIa" { \voiceOne \VIAgnusKey\VIAgnusSettings\VIAgnusOIIaMusic }
-%     \context Voice = "VIAgnusOIIb" { \voiceTwo \VIAgnusKey\VIAgnusSettings\VIAgnusOIIbMusic }
-%   >>
-% >>
+  \context Staff = "VIAgnusOISt" << 
+    \OIClef
+    \context Voice = "VIAgnusOIa" { \voiceOne \VIAgnusKey\VIAgnusSettings\VIAgnusOIaMusic }
+    \context Voice = "VIAgnusOIb" { \voiceTwo \VIAgnusKey\VIAgnusSettings\VIAgnusOIbMusic }
+    \context Voice = "VIAgnusODynamics" { \VIAgnusSettings\dynamicDown\VIAgnusODynamics }
+  >> 
+%   \context Dynamics = "VIAgnusODynamics" { \VIAgnusODynamics }
+  \context Staff = "VIAgnusOIISt" <<
+    \OIIClef
+    \context Voice = "VIAgnusOIIa" { \voiceOne \VIAgnusKey\VIAgnusSettings\VIAgnusOIIaMusic }
+    \context Voice = "VIAgnusOIIb" { \voiceTwo \VIAgnusKey\VIAgnusSettings\VIAgnusOIIbMusic }
+  >>
+>>
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_A.ly b/Pembaur_ErsteLateinischeMesse_Es-Dur_A.ly
index ad576fd0fe71933b9e761ff12b6694aa1f35abb7..fb6aca10aa4de5f7517bf2be0ab872c747c7d8cc 100644
--- a/Pembaur_ErsteLateinischeMesse_Es-Dur_A.ly
+++ b/Pembaur_ErsteLateinischeMesse_Es-Dur_A.ly
@@ -1,4 +1,3 @@
-%lilypond input for Pembaur's Vierte Lateinische Messe in C
 \include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Vocal.ly"
 
 \header { 
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_A.pdf b/Pembaur_ErsteLateinischeMesse_Es-Dur_A.pdf
index 8ed5b4055ee566dea87543496311bb6cb8a49ee7..7cd1e0ce6b66fa073e37f6ed58b3c06db4f7c0b5 100644
Binary files a/Pembaur_ErsteLateinischeMesse_Es-Dur_A.pdf and b/Pembaur_ErsteLateinischeMesse_Es-Dur_A.pdf differ
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_B.ly b/Pembaur_ErsteLateinischeMesse_Es-Dur_B.ly
index 25ca30f6e0e7b5774169d3077d5e0cd6f19d1a20..4bd5954d5bca89d8f5c75d147040f8ded3846d46 100644
--- a/Pembaur_ErsteLateinischeMesse_Es-Dur_B.ly
+++ b/Pembaur_ErsteLateinischeMesse_Es-Dur_B.ly
@@ -1,4 +1,3 @@
-%lilypond input for Pembaur's Vierte Lateinische Messe in C
 \include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Vocal.ly"
 
 \header { 
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_B.pdf b/Pembaur_ErsteLateinischeMesse_Es-Dur_B.pdf
index eee7a60f7f4fd6fa9e277208d16de3838583419b..2d8e3da4de2853b3de5a4e4d79a01db8b6d4beb1 100644
Binary files a/Pembaur_ErsteLateinischeMesse_Es-Dur_B.pdf and b/Pembaur_ErsteLateinischeMesse_Es-Dur_B.pdf differ
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_ChoralScore.ly b/Pembaur_ErsteLateinischeMesse_Es-Dur_ChoralScore.ly
index 19d373369ade659c78bec104aed9274942d6b9c4..38fb0ef77af10cf97307cdc84e0a1e55098e7f4e 100644
--- a/Pembaur_ErsteLateinischeMesse_Es-Dur_ChoralScore.ly
+++ b/Pembaur_ErsteLateinischeMesse_Es-Dur_ChoralScore.ly
@@ -1,4 +1,3 @@
-%lilypond input for Pembaur's Vierte Lateinische Messe in C
 \include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_FullScore.ly"
 \include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Vocal.ly"
 % #(set-global-staff-size 18)
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_ChoralScore.pdf b/Pembaur_ErsteLateinischeMesse_Es-Dur_ChoralScore.pdf
index 669eb00f2332638d0f9de0a6fbcc71d49dadcdf7..b7ff2a5aca72bfac837ed149405e1724ffca687d 100644
Binary files a/Pembaur_ErsteLateinischeMesse_Es-Dur_ChoralScore.pdf and b/Pembaur_ErsteLateinischeMesse_Es-Dur_ChoralScore.pdf differ
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_O.ly b/Pembaur_ErsteLateinischeMesse_Es-Dur_O.ly
index b49fcfd5091d8edf8ac5a9f8b863c0e190528949..e3f1c6f5fe592998b7f2f7187598d751dcf0c3aa 100644
--- a/Pembaur_ErsteLateinischeMesse_Es-Dur_O.ly
+++ b/Pembaur_ErsteLateinischeMesse_Es-Dur_O.ly
@@ -1,4 +1,3 @@
-%lilypond input for Pembaur's Vierte Lateinische Messe in C
 \include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Instrument.ly"
 
 \header { 
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_O.pdf b/Pembaur_ErsteLateinischeMesse_Es-Dur_O.pdf
index 80a89f72cfff268dcf00e816500b12f68128f15f..341075b317906e872973acf536fc1cc94ecd3146 100644
Binary files a/Pembaur_ErsteLateinischeMesse_Es-Dur_O.pdf and b/Pembaur_ErsteLateinischeMesse_Es-Dur_O.pdf differ
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_OrganScore.ly b/Pembaur_ErsteLateinischeMesse_Es-Dur_OrganScore.ly
index 65c72c914f128cccf4429cf5e0d9752ad631766e..8ce9e742d148c2c4943907b7eb862db2e503c6f4 100644
--- a/Pembaur_ErsteLateinischeMesse_Es-Dur_OrganScore.ly
+++ b/Pembaur_ErsteLateinischeMesse_Es-Dur_OrganScore.ly
@@ -1,4 +1,3 @@
-%lilypond input for Pembaur's Vierte Lateinische Messe in C
 \include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_FullScore.ly"
 % #(set-global-staff-size 17)
 
@@ -15,4 +14,3 @@
 \createScore #"IVSanctus" #'("OrganScore")
 \createScore #"VBenedictus" #'("OrganScore")
 \createScore #"VIAgnus" #'("OrganScore")
-
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_OrganScore.pdf b/Pembaur_ErsteLateinischeMesse_Es-Dur_OrganScore.pdf
index 2a10ad46d30ca4b16dcbcbeed079d20d5f966ad3..c7ca259b6caf3c620d0979352b32013d62535957 100644
Binary files a/Pembaur_ErsteLateinischeMesse_Es-Dur_OrganScore.pdf and b/Pembaur_ErsteLateinischeMesse_Es-Dur_OrganScore.pdf differ
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_OrganScore.toc b/Pembaur_ErsteLateinischeMesse_Es-Dur_OrganScore.toc
index e0d6f8987a07550aacdd240b0034bece61ba68d4..4f9fb4caec16a4f2295d445188fddde3c47f2ad7 100644
--- a/Pembaur_ErsteLateinischeMesse_Es-Dur_OrganScore.toc
+++ b/Pembaur_ErsteLateinischeMesse_Es-Dur_OrganScore.toc
@@ -1,6 +1,6 @@
 1, section, 1, {Kyrie}, toc53,
 3, section, 1, {Gloria}, toc54,
-6, section, 1, {Credo}, toc55,
-10, section, 1, {Sanctus}, toc56,
-11, section, 1, {Benedictus}, toc57,
-12, section, 1, {Agnus}, toc58
\ No newline at end of file
+7, section, 1, {Credo}, toc55,
+13, section, 1, {Sanctus}, toc56,
+15, section, 1, {Benedictus}, toc57,
+17, section, 1, {Agnus}, toc58
\ No newline at end of file
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_S.ly b/Pembaur_ErsteLateinischeMesse_Es-Dur_S.ly
index dbb590402f94f55acdb03f912e68952baf327664..cf8c5ed700a4a7d1f3dece89557f260b9ff25f0c 100644
--- a/Pembaur_ErsteLateinischeMesse_Es-Dur_S.ly
+++ b/Pembaur_ErsteLateinischeMesse_Es-Dur_S.ly
@@ -1,4 +1,3 @@
-%lilypond input for Pembaur's Vierte Lateinische Messe in C
 \include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Vocal.ly"
 
 \header { 
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_S.pdf b/Pembaur_ErsteLateinischeMesse_Es-Dur_S.pdf
index 4dc1174836900c2e1f911b1fe63c04ce390916c3..8102e1d57be9a39e235fa1fd7e2a3b10fe533998 100644
Binary files a/Pembaur_ErsteLateinischeMesse_Es-Dur_S.pdf and b/Pembaur_ErsteLateinischeMesse_Es-Dur_S.pdf differ
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_Settings.ly b/Pembaur_ErsteLateinischeMesse_Es-Dur_Settings.ly
index ff9f65e4a9eaa14efb7d0e682b9147f194fe61ce..0319226034ec390444b151c20cbee6b485141656 100644
--- a/Pembaur_ErsteLateinischeMesse_Es-Dur_Settings.ly
+++ b/Pembaur_ErsteLateinischeMesse_Es-Dur_Settings.ly
@@ -1,5 +1,3 @@
-%lilypond input for Pembaur's Vierte Lateinische Messe in C
-
 #(set-default-paper-size "a4")
 #(ly:set-option 'point-and-click #f)
 
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_FullScore.ly b/Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_FullScore.ly
index 8c6f3962363d083f71b458858b3a21aaec009201..ca642366c3d3437e88021e9c1408ea204ac35917 100644
--- a/Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_FullScore.ly
+++ b/Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_FullScore.ly
@@ -1,5 +1,3 @@
-% lilypond input for Pembaur's Erste Lateinische Messe
-% changes to the global score settings for single-instrument sheets
 \include "Pembaur_ErsteLateinischeMesse_Es-Dur_Settings.ly"
 
 #(set-default-paper-size "a4")
@@ -17,21 +15,8 @@
   }
 }
 
-\paper {
-  bookTitleMarkup = \titlePageMarkup
-}
-
-
-
 \header { 
-  titlepagetitle = \markup \center-align { "Erste lateinische Messe" "in Es-Dur" }
-  publisher = \markup \center-align { "Edition Kainhofer, 2008" \line{\scoreNumber \FullScoreNumber}}
+%   publisher = \markup \center-align \concat { "Edition Kainhofer, 2008, " \scoreNumber\FullScoreNumber}
   ensemble = \markup { \fill-line { "Coro (SATB) ed Orchestra o Organo" } }
-  instruments = \markup { \column { 
-    \line {"2 Clarinetti/Oboi, 2 Corni, (2 Trombe, Timpani)"} 
-    \line {"2 Violini, Viola, Violoncello ed Contrabbasso"}} }
-  scoretype = "Partitur / Full Score"
-% %   subtitle = \markup { \center-align{"für Sopran, Alt, Tenor, Bass, Streichquartett," "2 Clarineten (od. Oboen), 2 Hörner, Trompeten & Pauken" "oder Orgel"}}
-%   subsubtitle = \markup{ \medium \fontsize #1 "Kurz und sehr leicht ausführbar" }
 }
 
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Global.ly b/Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Global.ly
index fce5ce10f8c31006816e099df2a1ff53583d2ab5..2d5acc731c78494724750f068cee08f3c1d50f3f 100644
--- a/Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Global.ly
+++ b/Pembaur_ErsteLateinischeMesse_Es-Dur_Settings_Global.ly
@@ -3,7 +3,7 @@
 \include "orchestrallily/orchestrallily.ly"
 \include "orchestrallily/oly_settings_names.ly"
 
-EKnumber="EK-F0024"
+EKnumber="EK-021"
 
 \header { 
   title = "Erste lateinische Messe in Es-Dur"
@@ -11,15 +11,12 @@ EKnumber="EK-F0024"
   enteredby = "Reinhold Kainhofer"
   maintainer = "R. Kainhofer"
   maintainerEmail = "reinhold@kainhofer.com"
-  lastupdated = "May 2008"
-  copyright = \markup \column{ 
-      \line { "2008, Edition Kainhofer, Vienna. Alle Rechte vorbehalten / All rights reserved / Printed in Austria."} 
+  copyright = \markup \abs-fontsize #9 \column{ 
+      \line { "2009, Edition Kainhofer, Vienna. Alle Rechte vorbehalten / All rights reserved / Printed in Austria."} 
       \line {"Die Ausgabe darf kopiert und ohne Einschränkungen aufgeführt werden. / May be copied and performed without restriction."}
   }
 }
 
-% \include "deutsch.ly"
-
 \orchestralScoreStructure #'(
 ; Part-combined staves for full score
   ("Cl" "PartCombinedStaff" ("ClI" "ClII"))
@@ -51,50 +48,6 @@ EKnumber="EK-F0024"
   ("LongScore" "SimultaneousMusic" ("WdLong" "BrLong" "Tim" "Str" "Ch" "O" "VceB"))
 )
 
-% \include "deutsch.ly"
-
-
-
-TbeKey = {
-  \key c \major
-  \transposition c
-}
-TbeIKey = \TbeKey
-TbeIIKey = \TbeKey
-
-CorKey = {
-  \key c \major
-  \transposition c
-}
-CorIKey = \CorKey
-CorIIKey = \CorKey
-
-TimKey = {
-  \key c \major
-}
-
-
-
-% IIIChorCorIInstrumentName = \markup { \column { "Corno I" \line{"in Mi"{\smaller\flat}"/Es"} } }
-% IIIChorCorIIInstrumentName = \markup { \column { "Corno II" \line{"in Mi"{\smaller\flat}"/Es"} } }
-% IIIChorCorInstrumentName = \markup { \column { "Corni" \line{"in Mi"{\smaller\flat}"/Es"} } }
-% VChorCorIInstrumentName = \markup { \column { "Corno I" "in Sol/G" } }
-% VChorCorIIInstrumentName = \markup { \column { "Corno II" "in Sol/G" } }
-% VChorCorInstrumentName = \markup { \column { "Corni" "in Sol/G" } }
-% IXChorCorIInstrumentName = \markup { \column { "Corno I" "in Mi/E" } }
-% IXChorCorIIInstrumentName = \markup { \column { "Corno II" "in Mi/E" } }
-% IXChorCorInstrumentName = \markup { \column { "Corni" "in Mi/E" } }
-
-CorInstrumentName = \markup{\column{"Corno I,II in C"}}
-CorIInstrumentName = \markup{\column{"Corno I in C"}}
-CorIIInstrumentName = \markup{\column{"Corno II in C"}}
-TbeInstrumentName = \markup{\column{"Tromba I,II in C"}}
-TbeIInstrumentName = \markup{\column{"Tromba I in C"}}
-TbeIIInstrumentName = \markup{\column{"Tromba II in C"}}
-
-FlInstrumentName = "Flauto"
-
-
 \layout {
   \context { \Staff 
     \override VerticalAxisGroup #'minimum-Y-extent = #'(-1. . 3)
diff --git a/Pembaur_ErsteLateinischeMesse_Es-Dur_T.pdf b/Pembaur_ErsteLateinischeMesse_Es-Dur_T.pdf
index 9a732f4b16b7f4a17d721b2f8fc86b28b1947b91..0901e9dea97cf6d9cf861badda432069ede1f8c9 100644
Binary files a/Pembaur_ErsteLateinischeMesse_Es-Dur_T.pdf and b/Pembaur_ErsteLateinischeMesse_Es-Dur_T.pdf differ