diff --git a/Makefile b/Makefile
index c98fded7bb113edd54fe11d3617601aa850dd10e..6521bba9400b5cad6a2fb09acde585eea66d596c 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ OUT=out
 
 base = Randhartinger_AdTeLevavi
 SRCS = $(base)_Music_AdTeLevavi.ily $(base)_Settings_Global.ily $(base)_Settings.ily $(base)_Settings_Instrument.ily $(base)_Settings_VocalVoice.ily $(base)_Settings_FullScore.ily
-instruments = ASolo VaSolo VI VII Va Vc Cb
+instruments = ASolo VaSolo VI VII Va Vc Cb VcB
 scores = Long
 pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) \
      $(scores:%=$(OUT)/$(base)_Score_%.pdf)
diff --git a/Randhartinger_AdTeLevavi_Instrument_VcB.ly b/Randhartinger_AdTeLevavi_Instrument_VcB.ly
new file mode 100644
index 0000000000000000000000000000000000000000..c4e704d147c093dfd2a0943dd79a60c77faa42a0
--- /dev/null
+++ b/Randhartinger_AdTeLevavi_Instrument_VcB.ly
@@ -0,0 +1,10 @@
+\version "2.13.29"
+\include "Randhartinger_AdTeLevavi_Settings_Instrument.ily"
+
+\header {
+  instrument = \VcInstrumentName
+  scorenumber = \markup{\scoreNumber \VcBNumber}
+}
+
+\createScore #"AdTeLevavi" #'("VcB")
+
diff --git a/Randhartinger_AdTeLevavi_Music_AdTeLevavi.ily b/Randhartinger_AdTeLevavi_Music_AdTeLevavi.ily
index 09320234a584100d0cb91a4cbab3e3aa119fd350..8f2244d730ceb7503bd62d536caf3949f07ff9b3 100644
--- a/Randhartinger_AdTeLevavi_Music_AdTeLevavi.ily
+++ b/Randhartinger_AdTeLevavi_Music_AdTeLevavi.ily
@@ -1,8 +1,5 @@
 \version "2.13.29"
 
-% AdTeLevaviPieceName = "Ad te levavi"
-% AdTeLevaviTempo = "TODO"
-
 AdTeLevaviKey = \key e \major
 AdTeLevaviTimeSignature = \time 2/4
 
@@ -39,13 +36,13 @@ AdTeLevaviASoloMusic = \relative c' {
 	h'4 h,8 r | \barNumberCheck #30
 	fis'4 fis8 ais | % 31
 	h4 fis8 r | % 32
-	cis'4 h16[( ais]) gis[( a]) | % 33
+	cis'4 h16[( ais]) gis[( ais]) | % 33
 	h4\fermata h,8\fermata r | % 34
 	R2*8 \AdTeLevaviSettingsII % 42
 	g'!4\mf d8 h' | % 43
-	h16[( a]) g f g4 | \barNumberCheck #44
+	h16[( a]) g fis g4 | \barNumberCheck #44
 	e8. fis16 a16[( g]) fis[( e]) | % 45
-	d4 b8 r | % 46
+	d4 h8 r | % 46
 	d4. d16.[( d'32]) | % 47
 	d4 c16[( h]) a[( g]) | % 48
 	fis8. fis16 g[( fis]) g[( h]) | % 49
@@ -100,11 +97,11 @@ AdTeLevaviASoloMusic = \relative c' {
 	gis4 fis8 gis | \barNumberCheck #104
 	a4. cis16[( h]) | % 105
 	a4 gis | % 106
-	cis d | % 107
+	cis dis | % 107
 	e gis,8 cis | % 108
 	h4( a) | \barNumberCheck #109
 	gis4 r | \barNumberCheck #110
-	cis d | % 111
+	cis dis | % 111
 	e4 e,8 h'16[( a]) | % 112
 	gis4( fis) | % 113
 	e4. r8 | \barNumberCheck #114
@@ -150,7 +147,7 @@ AdTeLevaviVaSoloMusic = \relative c' {
 	h'4. dis,8 | \barNumberCheck #10
 	e8[(\turn a16 gis]) fis[( e] \times 2/3 {dis[ e cis])} | % 11
 	h4~ h16[ his( cis a]) | % 12
-	gis8 r16 cis'16( cis dis disis eis]) |  % 13 % TODO: cis cis???
+	gis8 r16 h'16( his[ cis cisis dis]) |  % 13
 	<< {e2~} {s4\< s4\>} >> | % 14
 	e8.[\! cis16]( cisis[ dis e eis]) | % 15
 	<< {fis2~} {s4\< s4\>} >> | % 16
@@ -159,7 +156,7 @@ AdTeLevaviVaSoloMusic = \relative c' {
 	gis8 gis[-> a-> ais->] | % 19
 	h-> e[(\< gis cis]) | \barNumberCheck #20
 	h16[(\! a32( gis fis e dis cis]) h[(^\pocorit ais h cis]) h[( ais gis fis]) | % 21
-	e4\fermata r | % 22 % TODO: Wirklich e???
+	e4\fermata r | % 22
 	R2*3 | % 25
 	r4 r8 h'16.[(\mf h'32]) | % 26
 	h4. dis,8 | % 27
@@ -167,12 +164,12 @@ AdTeLevaviVaSoloMusic = \relative c' {
 	R2 | % 29
 	r8 dis16[(\mf e] fis[ gis ais h]) | \barNumberCheck #30
 	his8[ cis]~ cis16[ ais( fis e]) | % 31
-	d8 fis,16[( gis] ais[ h cis dis]) | % 32
+	dis8 fis,16[( gis] ais[ h cis dis]) | % 32
 	e2 | % 33
 	dis4.\fermata h8\p | % 34
 	fis'4 dis8[( h]) | % 35
 	g'8.[( fis32 g]) a16[( g fis e]) | % 36
-	d8~ d32[ cis(\< d e] fis[ g a h] c[ cis e r64 d])\! | % 37
+	d8~ d32[ cis!(\< d e] fis[ g a h] c[ cis e r64 d])\! | % 37
 	h8.[\> g,16]( h[\! d g h]) | % 38
 	dis4 c8[( h]) | % 39
 	h4 a8[( ais]) | \barNumberCheck #40
@@ -185,7 +182,7 @@ AdTeLevaviVaSoloMusic = \relative c' {
 	a16[( g d h] g]) d[( g h]) | % 48
 	c[( d, d' c]) h[( ais h g]) | % 49
 	fis16[( d fis a]) d[( a fis' d]) | \barNumberCheck #50
-	a'[( g e cis] a8[)-| c]\turn | % 51
+	a'[( g e cis] a8[)-| cis]\turn | % 51
 	e16[( d a fis] c[) a'32(\< h] cis[ d e fis]) | % 52
 	g4\f e8[ a] | % 53
 	d,4~ d8 r |  % 54
@@ -214,19 +211,19 @@ AdTeLevaviVaSoloMusic = \relative c' {
 	gis4. gis'8 \> | % 85
 	gis4( a8)\! r | % 86
 	R2*3 | % 89
-	r4 r8 h16.[(\p fis32]) \AdTeLevaviSettingsIII \barNumberCheck #90
+	r4 r8 \clef "treble" h16.[(\p fis'32]) \AdTeLevaviSettingsIII \barNumberCheck #90
 	fis4 e16[( dis cis h]) | % 91
-	h8.[( e'16]) dis[( e fis gis]) | % 92
+	h8.[( e16]) dis[( e fis gis]) | % 92
 	a8.[( fis16]) a[( gis fis e]) | % 93
 	h4~ h8 r | % 94
-	e,4\p e8[( fis]) | % 95
+	\VaClef e,4\p e8[( fis]) | % 95
 	e4( dis8) e | % 96
 	fis4. a16[( gis]) | % 97
 	fis4( e) | % 98
 	e-> a8[ a] | % 99
 	gis8.[( h16]) a[( gis fis e]) | \barNumberCheck #100
 	dis8[( e]) fis[( e]) | % 101
-	e4 r | % 102
+	dis4 r | % 102
 	e\mf e8[(-| fis])-| | % 103
 	e4( dis8) e | % 104
 	fis4. a16[( gis]) | % 105
@@ -236,7 +233,7 @@ AdTeLevaviVaSoloMusic = \relative c' {
 	fis4 dis | % 109
 	e r | \barNumberCheck #110
 	a4-> <a h,>-> | % 111
-	<g h,>-> e8[ fis] | % 112
+	<gis h,>-> e8[ fis] | % 112
 	e4 dis | % 113
 	e r8 h8\p | % 114
 	fis'4 e16[( dis cis h]) | % 115
@@ -292,7 +289,7 @@ AdTeLevaviVIMusic = \relative c'' {
 	r8 d4 d8 | % 37
 	d4. r8 | % 38
 	r8 f8[( e d]) | % 39
-	cis4. cis8 | \barNumberCheck #40
+	cis!4. cis8 | \barNumberCheck #40
 	d8 r r4 | % 41
 	fis8 r r4 \AdTeLevaviSettingsII % 42
 	d2\mf | % 43
@@ -315,7 +312,7 @@ AdTeLevaviVIMusic = \relative c'' {
 	g4 g,8[(\p b]) | \barNumberCheck #60
 	a4( fis) | % 61
 	g8.[\ff g16] a16[( h c d]) | % 62
-	e4 fis | % 63
+	e4 fis! | % 63
 	g4 h,,8[(\p e]) | % 64
 	d4 fis | % 65
 	g8 h,[ h h] | % 66
@@ -326,7 +323,7 @@ AdTeLevaviVIMusic = \relative c'' {
 	e2 | % 71
 	e | % 72
 	e4( dis) | % 73
-	e4 d8[\mf fis] | % 74
+	e4 e8[\mf fis] | % 74
 	g2 | % 75
 	g2 | % 76
 	g4 fis | % 77
@@ -355,7 +352,7 @@ AdTeLevaviVIMusic = \relative c'' {
 	h4. h8 | \barNumberCheck #100
 	h8[ h] h4 | % 101
 	h8 h'[(\< ais a]) | % 102
-	gis8\mf h,4 cis8 | % 103 % TODO: gis oder e???
+	gis8\mf gis,4 cis8 | % 103
 	h8 r h[ h] | % 104
 	cis[( c h) h] | % 105
 	h4~ h16[\< e( gis h]) | % 106
@@ -363,7 +360,7 @@ AdTeLevaviVIMusic = \relative c'' {
 	e e,8[ g] | % 108
 	fis4 dis | % 109
 	e8.[\ff e16] fis16[ gis a h] | \barNumberCheck #110
-	cis4-> dis-> | % 111 % TODO: dis mit #???
+	cis4-> dis!-> | % 111
 	e4-> gis,,8[( cis]) | % 112
 	h4 dis | % 113
 	e8[ e\p e e] | % 114
@@ -386,7 +383,7 @@ AdTeLevaviVIIMusic = \relative c'' {
 	gis8 h[ dis e] | % 3
 	fis4 e | % 4
 	dis8 <fis dis>4->\fermata r8 | % 5
-	h,,8[\p his( dis ais]) | % 6
+	h,,8[\p his( cis ais]) | % 6
 	h4 h8[ h] | % 7
 	h8.[ h16] h8[ h] | % 8
 	h4~ h8 r | % 9
@@ -402,7 +399,7 @@ AdTeLevaviVIIMusic = \relative c'' {
 	e e,8[( fis fisis]) | % 19
 	gis8 e4\< e8 | \barNumberCheck #20
 	dis8\fz r h\p r | % 21
-	gis4\fermata r | % 22
+	h4\fermata r | % 22
 	r8\p h4 h8 | % 23
 	h4. r8 | % 24
 	a4( gis) | % 25
@@ -454,7 +451,7 @@ AdTeLevaviVIIMusic = \relative c'' {
 	h2 | % 71
 	c | % 72
 	h | % 73
-	h4 h8[\mf <d a>] | % 74 % TODO: <d a>???
+	h4 h8[\mf <d a>] | % 74
 	<d h>2 | % 75
 	e | % 76
 	d | % 77
@@ -474,7 +471,7 @@ AdTeLevaviVIIMusic = \relative c'' {
 	h4 r | % 91
 	h r | % 92
 	h8 r h r | % 93
-	h[ h~] h16 fis'(\> e h]) | % 94
+	h[ h~] h16[ fis'(\> e h]) | % 94
 	h8\p gis4 cis8 | % 95
 	h8 r h8[(-. h])-. | % 96
 	cis8[( c h h]) | % 97
@@ -483,14 +480,14 @@ AdTeLevaviVIIMusic = \relative c'' {
 	h4. h8 | \barNumberCheck #100
 	h8[ h] h4 | \barNumberCheck #101
 	h8 dis8[(\< e fis]) | % 102
-	e8\mf gis,4 cis8 | % 103 % TODO: e oder h???
+	e8\mf gis,4 cis8 | % 103
 	h8 r h[ h] | % 104
 	cis[( c h) h] | % 105
 	h4~ h16[ \< e( e e]) | % 106
 	a4\ff h | % 107
 	h e,8[ e] | % 108
 	h2 | % 109
-	h8.[\ff h16] h[ e fis gis] | \barNumberCheck #110  % TODO: fis oder e?
+	h8.[\ff h16] h[ e fis gis] | \barNumberCheck #110
 	a4-> h-> | % 111
 	h4-> gis,8[( cis]) | % 112
 	h4 h | % 113
@@ -514,7 +511,7 @@ AdTeLevaviVaMusic = \relative c' {
 	h h'[ h h] | % 3
 	h4 h | % 4
 	h8 h4->\fermata r8 | % 5
-	gis,4\p a8[( fisis]) | % 6 % TODO: o???
+	gis,4\p a8[( fisis]) | % 6
 	gis4 h8[( h]) | % 7
 	fis8.[( a16]) gis[( fisis gis e]) | % 8
 	gis4( fis8) r | % 9
@@ -562,7 +559,7 @@ AdTeLevaviVaMusic = \relative c' {
 	a4. a8 | % 51
 	a4. fis8 | % 52
 	e4\f g | % 53
-	fis8[ a(\p g <d' c>)] | % 54 % TODO: p auf 1. oder 2. Achtel?
+	fis8[ a(\p g <d' c!>)] | % 54
 	<d h>4 e | % 55
 	d4. d8 | % 56
 	e8[( es d) d] | % 57
@@ -572,7 +569,7 @@ AdTeLevaviVaMusic = \relative c' {
 	d2 | % 61
 	h8.[\ff h16] c[( d c f]) | % 62
 	e4 <c' d,> | % 63
-	<h g>4\p g, | % 64 % TODO: p auf 1. oder 2. Schlag?
+	<h g>4 g,\p | % 64
 	g16[( a h c] d8[) <d c>] | % 65
 	<d h>8 d,[ d d] | % 66
 	fis4 a8[( fis]) | % 67
@@ -606,7 +603,7 @@ AdTeLevaviVaMusic = \relative c' {
 	gis8\p r r4 | % 95
 	R2*6 | \barNumberCheck #101
 	h8 fis4(\< h8) | % 102
-	h8\mf e,4 a8 | % 103  % TODO: h oder g auf 1. Achtel?
+	h8\mf e,4 a8 | % 103
 	e4 dis8[ h'] | % 104
 	a4. dis,8 | % 105
 	e4~ e16[\< gis( h gis]) | % 106
@@ -637,11 +634,8 @@ AdTeLevaviVcMusic = \relative c' {
 	e8 gis[ fis e] | % 3
 	dis4 e8[( gis]) | % 4
 	h8 h,4\fermata-> r8 | % 5
-	%% Basso: e4\p e | % 6
-	%% Basso: e8.[( gis16]) a[( gis fis e]) | % 7
 	e,4\p e | % 6
 	e8.[( gis'16]) a[( gis fis e]) | % 7
-	%% end Cello
 	h8[ h h h] | % 8
 	h4~ h8 r | % 9
 	r\p a'8[(-. a-. a])-. | \barNumberCheck #10
@@ -658,11 +652,8 @@ AdTeLevaviVcMusic = \relative c' {
 	h8\fz r h8\p r | % 21
 	e,4\fermata r | % 22
 	r8\p e16.[( gis32] h8[ a]) | % 23
-	%% Basso: gis4~ gis8 r | % 24
-	%% Basso: h4 h | % 25
 	gis8[ h16 e] gis8 r | % 24
 	h,4 h | % 25
-	%% end Cello
 	h4~ h8 r | % 26
 	r a'[ gis fis] | % 27
 	gis4 r | % 28
@@ -684,25 +675,24 @@ AdTeLevaviVcMusic = \relative c' {
 	d4 g | % 44
 	c2 | % 45
 	g | % 46
-	fis4. d8 | % 47  % TODO: fis oder g???
+	fis4. d8 | % 47
 	g4. d8 | % 48
 	a'8 r g r | % 49
-	%% end Cello
 	d8 d'[ d d] | \barNumberCheck #50
 	a4. a8 | % 51
 	a4. a8 | % 52
 	a4\f a | % 53
-	d8[\p c( h a]) | % 54
+	d8[ c!(\p h a]) | % 54
 	g4 c, | % 55
 	d8[ d'( c h]) | % 56
 	a[( g fis) fis'] | % 57
 	fis4 g | % 58
 	c,\f a | % 59
-	g g'8[(\p g]) | \barNumberCheck #60  % TODO: \p auf 1. oder 2. Schlag???
+	g g'8[(\p g]) | \barNumberCheck #60
 	g4( a) | % 61
 	g8.[\p g16] fis[( f e d]) | % 62
 	c4 a | % 63
-	g4\p e'8[( c]) | % 64 % TODO: \p auf 1. oder 2. Schlag???
+	g4 e'8[(\p c]) | % 64
 	d2 | % 65
 	g8 g,[ g g] | % 66
 	g2 | % 67
@@ -712,7 +702,7 @@ AdTeLevaviVcMusic = \relative c' {
 	e,2 | % 71
 	a | % 72
 	h | % 73
-	e,4 e'8[(\mf c] | % 74
+	e,4 e'8[(\mf c]) | % 74
 	g2 | % 75
 	c | % 76
 	d | % 77
@@ -766,36 +756,69 @@ AdTeLevaviVcMusic = \relative c' {
 \addQuote "AdTeLevaviVcMusic" { \AdTeLevaviVcMusic }
 
 
-AdTeLevaviCbMusic = \relative c' {
+AdTeLevaviCbMusic = \relative c {
 	\quoteDuring "AdTeLevaviVcMusic" {s8 | s2*4 } | % 5
 	e4\p e | % 6
-	e8.[( gis16]) a[( gis fis e]) | % 7
-	\quoteDuring "AdTeLevaviVcMusic" { s2*6 } | % 13
-	R2*6 | % 19
-	r8 h4\< h8 | \barNumberCheck #20
-	\quoteDuring "AdTeLevaviVcMusic" { s2*3 } | % 23
-	gis4~ gis8 r | % 24
-	h4 h | % 25
-	\quoteDuring "AdTeLevaviVcMusic" { s2*21 | s4. } d'8 | % 47
+	e8.[( gis16]) \quoteDuring "AdTeLevaviVcMusic" { s4 | s2*6 } | % 13
+	R2*6 | \barNumberCheck #19
+	\quoteDuring "AdTeLevaviVcMusic" { s2*4 } | % 23
+	gis,4~ gis8 \quoteDuring "AdTeLevaviVcMusic" { s8 | s2*22 | s4. } d'8 | % 47
 	g4. d8 | % 48
-	a8 r g r | % 49
-	\quoteDuring "AdTeLevaviVcMusic" { s2*74 }
+	\quoteDuring "AdTeLevaviVcMusic" { s2*75 }
 }
 \addQuote "AdTeLevaviCbMusic" { \AdTeLevaviCbMusic }
 
 
 AdTeLevaviVcBMusic = \relative c' {
-	\quoteDuring "AdTeLevaviVcMusic" {s8 | s2*4 } | % 5
-	e4\p e | % 6
-	e8.[( gis16]) a[( gis fis e]) | % 7
-	\quoteDuring "AdTeLevaviVcMusic" { s2*6 } | % 13
-	R2*6 | % 19
-	r8 h4\< h8 | \barNumberCheck #20
-	\quoteDuring "AdTeLevaviVcMusic" { s2*3 } | % 23
-	gis4~ gis8 r | % 24
-	h4 h | % 25
-	\quoteDuring "AdTeLevaviVcMusic" { s2*21 | s4. } d'8 | % 47
-	g4. d8 | % 48
-	a8 r g r | % 49
-	\quoteDuring "AdTeLevaviVcMusic" { s2*74 }
+	\quoteDuring "AdTeLevaviVcMusic" {s8 | s2*4 } | \barNumberCheck #5
+	<<
+		\context Voice="AdTeLevaviVcVoice" {
+			\override Voice.InstrumentSwitch #'direction = #DOWN
+			\voiceTwo
+			\cueText "Cello"
+			\quoteDuring "AdTeLevaviVcMusic" { s2 | s4 }
+		}
+		\context Voice="AdTeLevaviCbVoice" {
+			\override Voice.InstrumentSwitch #'direction = #UP
+			\voiceOne
+			\cueText "Basso"
+			\set Voice.quotedEventTypes = #'(note-event articulation-event rest-event slur-event beam-event beam-forbid-event)
+			\quoteDuring "AdTeLevaviCbMusic" { s2 | s4 }
+		}
+	>>
+	\quoteDuring "AdTeLevaviVcMusic" { s4 | s2*6 } | \barNumberCheck #13
+	\cueText "Cello"
+	\quoteDuring "AdTeLevaviVcMusic" { s2*6 } | \barNumberCheck #19
+	\cueText "Basso"
+	\quoteDuring "AdTeLevaviVcMusic" { s2*4 } | % 23
+	<<
+		\context Voice="AdTeLevaviVcVoice" {
+			\override Voice.InstrumentSwitch #'direction = #UP
+			\voiceOne
+			\cueText "Cello"
+			\quoteDuring "AdTeLevaviVcMusic" { s4. }
+		}
+		\context Voice="AdTeLevaviCbVoice" {
+			\override Voice.InstrumentSwitch #'direction = #DOWN
+			\voiceTwo
+			\cueText "Basso"
+			\quoteDuring "AdTeLevaviCbMusic" { s4. }
+		}
+	>> \quoteDuring "AdTeLevaviVcMusic" { s8 | s2*22 | s4. }
+	<<
+		\context Voice="AdTeLevaviVcVoice" {
+			\override Voice.InstrumentSwitch #'direction = #DOWN
+			\voiceTwo
+			\cueText "Cello"
+			\quoteDuring "AdTeLevaviVcMusic" { s8 | s2 }
+		}
+		\context Voice="AdTeLevaviCbVoice" {
+			\override Voice.InstrumentSwitch #'direction = #UP
+			\voiceOne
+			\cueText "Basso"
+% 			\set Voice.quotedEventTypes = #'(note-event articulation-event rest-event slur-event beam-event beam-forbid-event)
+			\quoteDuring "AdTeLevaviCbMusic" { s8 | s2 }
+		}
+	>>  | \barNumberCheck #48
+	\quoteDuring "AdTeLevaviVcMusic" { s2*75 }
 }
diff --git a/TeX_Randhartinger_AdTeLevavi_Include_ContentsMaterial.itex b/TeX_Randhartinger_AdTeLevavi_Include_ContentsMaterial.itex
index 5903dffe0a68c1f95437386de15bd92937720d5a..54885778563e49d536e760ee47e71084be12639e 100644
--- a/TeX_Randhartinger_AdTeLevavi_Include_ContentsMaterial.itex
+++ b/TeX_Randhartinger_AdTeLevavi_Include_ContentsMaterial.itex
@@ -22,6 +22,7 @@ Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
 \VIName{} (-\VINumber),
 \VIIName{} (-\VIINumber),
 \VaName{} (-\VaNumber),
+\VcBName{} (-\VcBNumber),
 \VcName{} (-\VcNumber),
 \CbName{} (-\CbNumber).