diff --git a/.gitignore b/.gitignore
deleted file mode 100755
index 128ea98..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.pdf
-/pdf
-/tmp
diff --git a/cheatsheet.ly b/cheatsheet.ly
index b809810..05c3e84 100644
--- a/cheatsheet.ly
+++ b/cheatsheet.ly
@@ -9,6 +9,7 @@
 \paper {
   indent = 0\mm
   ragged-bottom = ##t
+  ragged-right = ##f
 }
 \layout {
   indent = 30\mm
@@ -21,7 +22,9 @@
 \include "./lilydrum.ly"
 
 \score {
-	\new PipeBandDrumStaff {
+	\new PipeBandDrumStaff \with {
+		instrumentName = "Plain Notes"
+	} {
 		\time 2/4
 		\drummode {
 		  d4 g 
@@ -38,14 +41,12 @@
 		"\rimshot d" "\rimshot g" 
 		"\backstick d" "\backstick g"
     }
-	\header {
-	  	title = \markup \column {\line{Plain Notes}}
-		subtitle = ""
-	}
 }
 
 \score {
-	\new PipeBandDrumStaff {
+	\new PipeBandDrumStaff \with {
+		instrumentName = "Flourishing I"
+	} {
 	 	\time 2/4
 		\drummode {
 			d^\splitTheFeather g^\cartWheel
@@ -60,15 +61,13 @@
 		"\up" 
 		"d" "g" "d"
 		"\cart" "\stf"
-		"\flourish {" "d4" "g" "d" "g}"
+		"\flourish { d4" "g" "d" "g}"
     }
-	\header {
-	  	title = \markup \column {\line{Flourishing I}}
-		subtitle = ""
-	}
 }
 \score {
-	\new PipeBandDrumStaff {
+	\new PipeBandDrumStaff \with {
+		instrumentName = "Flourishing II"
+	} {
 		\drummode {
 			d^\lthrow g^\rthrow 
 			d^\bthrow r |
@@ -89,13 +88,11 @@
 		"\andrewStop" "\quiggs" "\stop"   
 		"\blfy" "\rblfy"
     }
-	\header {
-	  	title = \markup \column {\line{Flourishing II}}
-		subtitle = ""
-	}
 }
 \score {
-	\new PipeBandDrumStaff {
+	\new PipeBandDrumStaff \with {
+		instrumentName = "Embellishments"
+	  } {
 		\time 2/4
 		\drummode {
 			\flam d		\flam g
@@ -112,47 +109,32 @@
 		"\ruff d"	"\ruff g"
 		"\sruff d"	"\sruff g"
 	}
-	\header {
-	  	title = \markup \line{ Embellishments }
-		subtitle = ""
-	}
 }
 \score {
-	\new PipeBandDrumStaff {
-		\time 4/4
+	\new PipeBandDrumStaff \with {
+	  instrumentName = \markup \column {\line {"Embellishments:"} \line {"Forced Hand"}}
+	  } {
+		\time 2/4
 		\drummode {
 			\flamg d	\flamd g
-			\flamg g	\flamd d
 			\dragg d	\dragd g
-			\dragg g	\dragd d
 			\odragg d	\odragd g
-			\odragg g	\odragd d
-			\break
 			\ruffg d	\ruffd g
-			\ruffg g	\ruffd d
 			\sruffg d	\sruffd g
-			\sruffg g	\sruffd d
 		}
 	}
     \addlyrics {
 		"\flamg d"	"\flamd g"
-		"\flamg g"	"\flamd d"
 		"\dragg d"	"\dragd g"
-		"\dragg g"	"\dragd d"
 		"\odragg d"	"\odragd g"
-		"\odragg g"	"\odragd d"
 		"\ruffg d"	"\ruffd g"
-		"\ruffg g"	"\ruffd d"
 		"\sruffg d"	"\sruffd g"
-		"\sruffg g"	"\sruffd d"
     }
-	\header {
-		title = \markup \column { \line {Embellishments: Forced Hand}}
-		subtitle = ""
-	}
 }
 \score {
-	\new PipeBandDrumStaff {
+	\new PipeBandDrumStaff \with {
+		instrumentName = "Rolls"
+	  } {
 	  	\time 4/4
 		\eighthBeaming
 		\drummode {
@@ -161,11 +143,7 @@
 		}
 	}
 	\addlyrics {
-		"d4:32(" "\\triplet " -- "\\flam d16." "g32"  -- "\\drag g16" -- "\\triplet" "g:64" "d-> }"
-    }
-	\header {
-		title = "Rolls"
-		subtitle = ""
+			"d4:32( d8:32)(-> g8)" "\flam d4" "d8:32( \dr \\tuplet 3/2 { g16[)" "d" "g }" "\drag d16." "g32]" "d32" "g" "d" "g" "d16." "g32->" "d16." "d32" "\flam g4"
     }
 }
 
@@ -173,7 +151,9 @@
 
 \pageBreak
 \score {
-	\new PipeBandDrumStaff {
+	\new PipeBandDrumStaff \with {
+		instrumentName = "Standard 6/8"
+	} {
 		\drummode {
 			\time 6/8
 			\repeat volta 2 {
@@ -191,14 +171,7 @@
 		}
 	}
 	\addlyrics {
-		\partial 8
-		"d8:32(" "\\triplet " -- "\\flam d16." "g32"  -- "\\drag g16" -- "\\triplet" "g:64" "d-> }"
     }
-
-	\header {
-		title = "And now for something completely standard"
-		subtitle = ""
-	}
 }
 % # Writing parts
 % rolls
diff --git a/cheatsheet.pdf b/cheatsheet.pdf
new file mode 100644
index 0000000..dfc1ba8
Binary files /dev/null and b/cheatsheet.pdf differ
diff --git a/lib/embellishments.ily b/lib/embellishments.ily
index a446b3b..afc0daa 100644
--- a/lib/embellishments.ily
+++ b/lib/embellishments.ily
@@ -32,10 +32,10 @@ dragddr = \drummode { \drumgrace { g16[\dr g] } } 	% Drag right with start repea
 draggdr = \drummode { \drumgrace { d16[\dr d] } } 	% Drag left  with start repeat
 
 % open drags
-odragd =   \drummode { \drumgrace { << { g16[ g] } { s32 s32^\markup { \musicglyph #"scripts.open" } } >> } }				% Open Drag right
-odragg =   \drummode { \drumgrace { << { d16[ d] } { s32 s32^\markup { \musicglyph #"scripts.open" } } >> }	}			% Open Drag left
-odragddr = \drummode { \drumgrace { << { d16[\dr d] } { s32 s32^\markup { \musicglyph #"scripts.open" } } >> } }	% Open Drag right with start repeat
-odraggdr = \drummode { \drumgrace { << { g16[\dr g] } { s32 s32^\markup { \musicglyph #"scripts.open" } } >> } }	% Open Drag left  with start repeat
+odragd =   \drummode { \drumgrace { << { g16[ g] } { s16 s32^\markup { \musicglyph #"scripts.open" } } >> } }				% Open Drag right
+odragg =   \drummode { \drumgrace { << { d16[ d] } { s16 s32^\markup { \musicglyph #"scripts.open" } } >> }	}			% Open Drag left
+odragddr = \drummode { \drumgrace { << { d16[\dr d] } { s16 s32^\markup { \musicglyph #"scripts.open" } } >> } }	% Open Drag right with start repeat
+odraggdr = \drummode { \drumgrace { << { g16[\dr g] } { s16 s32^\markup { \musicglyph #"scripts.open" } } >> } }	% Open Drag left  with start repeat
 
 % Ruff
 ruffg =   \drummode { \drumgrace { g16[ d g] } }				% Ruff right
diff --git a/lib/musical_functions.ily b/lib/musical_functions.ily
index e022eae..b267d5c 100644
--- a/lib/musical_functions.ily
+++ b/lib/musical_functions.ily
@@ -29,7 +29,7 @@ sixteenthCompoundBeaming = {
 	\set beatStructure = #'( 6 6 6 6)
 }
 % triplet
-triplet = #(define-music-function (parser location notes) (ly:music?) #{ \tuplet 3/2 { $notes } #})
+triplet = #(define-music-function (parser location music) (ly:music?) #{ \tuplet 3/2 { $music } #})
 
 % dynamics
 v = #(define-event-function (parser location) () #{ \upbow #})
@@ -104,14 +104,14 @@ tutti = #(define-music-function (music) (ly:music?)
 		<<
 			\tag #'tutti {
 					\override HorizontalBracket.connect-to-neighbor = #'(#t #t)
-					<>\startGroup
+					<>\dr
 					#(skip-of-length (allbutlastnote music))
-					<>\stopGroup
+					<>\fr
 					#(skip-of-length (lastnote music))
 					\revert HorizontalBracket.connect-to-neighbor
 			}
 			{
-					#music
+					$music
 			}
 		>>
 	#})