diff --git a/lib/embellishments.ily b/lib/embellishments.ily
index 18c6651..3f68101 100644
--- a/lib/embellishments.ily
+++ b/lib/embellishments.ily
@@ -48,10 +48,10 @@ odragddr = \drummode { \drumgrace { << { d16[\dr d] } { s16 s32^\markup { \music
 odraggdr = \drummode { \drumgrace { << { g16[\dr g] } { s16 s32^\markup { \musicglyph #"scripts.open" } } >> } }	% Open Drag left  with start repeat
 
 % Ruff
-ruffg =   \drummode { \drumgrace { d16[ g d] } }	% Ruff right
-ruffd =   \drummode { \drumgrace { g16[ d g] } }	% Ruff left
-ruffgdr = \drummode { \drumgrace { d16[\dr g d] } }	% Ruff right with start repeat
-ruffddr = \drummode { \drumgrace { g16[\dr d g] } }	% Ruff left  with start repeat
+ruffg =   \drummode { \drumgrace { g16[ d g] } }	% Ruff right
+ruffd =   \drummode { \drumgrace { d16[ g d] } }	% Ruff left
+ruffgdr = \drummode { \drumgrace { g16[\dr d g] } }	% Ruff right with start repeat
+ruffddr = \drummode { \drumgrace { d16[\dr g d] } }	% Ruff left  with start repeat
 
 % Swiss Ruff
 sruffg =   \drummode { \drumgrace { g16[ d d] } }		% Swiss Ruff right
diff --git a/lib/layout_tweaks.ily b/lib/layout_tweaks.ily
index f586070..ad84b20 100644
--- a/lib/layout_tweaks.ily
+++ b/lib/layout_tweaks.ily
@@ -74,8 +74,6 @@ drumPitchNames =
 		\override HorizontalBracket.staff-padding = #3.5		% staff-padding
 		\override HorizontalBracket.direction = #UP			% brackets above the staff
 		\override HorizontalBracket.bracket-flare = #'(0 . 0)	% vertical brackets
-		\override HorizontalBracket.outside-staff-priority = #100
-		\override HorizontalBracket.to-barline = ##t
 
 		subdivideBeams = ##t
 		strictBeatBeaming = ##t
diff --git a/lib/musical_functions.ily b/lib/musical_functions.ily
index 889c378..1b2855e 100644
--- a/lib/musical_functions.ily
+++ b/lib/musical_functions.ily
@@ -115,10 +115,13 @@ tutti =
 		)
 		(if (> (length es) 1)
 			#{% multiple notes
-				\once \override HorizontalBracket.connect-to-neighbor = #'(#t #t)
+				\once \override HorizontalBracket.to-barline = ##t
+				\override HorizontalBracket.connect-to-neighbor = #'(#t #t)
 				<>\dr
-				#myMusic
-				\fr
+				#(allbutlastnote myMusic)
+				<>\fr
+				#(lastnote myMusic)
+				\revert HorizontalBracket.connect-to-neighbor
 			#}
 			#{% single note
 				<>\rn