diff --git a/2-4_marches/mackenzie_highlanders/config.ily b/2-4_marches/mackenzie_highlanders/config.ily
index 7fe0ee2..8aed0e2 100644
--- a/2-4_marches/mackenzie_highlanders/config.ily
+++ b/2-4_marches/mackenzie_highlanders/config.ily
@@ -3,7 +3,7 @@
 global = {
 	\time 2/4
 	}
-configTempo = { \tempo 4 = 90 } 
+confTempo = { \tempo 4 = 90 } 
 %% Format
 part = { \partial 8 s8 }
 measure = { \grace { s4 } s2 | }
diff --git a/4-4_marches/51st_highland_division/config.ily b/4-4_marches/51st_highland_division/config.ily
index 7577a5a..455df55 100644
--- a/4-4_marches/51st_highland_division/config.ily
+++ b/4-4_marches/51st_highland_division/config.ily
@@ -7,7 +7,7 @@ confTempo = {
 	\tempo 4 = 90
 	}
 %% Format
-part = { \partial 4 s4 }
+part = { \partial 4 \grace { s4 } s4 }
 measure = { \grace { s4 } s1 | }
 halfline = { \repeat unfold 2 { \measure } }
 line = { \repeat unfold 2 { \halfline } }
diff --git a/4-4_marches/51st_highland_division/notes.pipes.ily b/4-4_marches/51st_highland_division/notes.pipes.ily
index 8f28970..5418185 100644
--- a/4-4_marches/51st_highland_division/notes.pipes.ily
+++ b/4-4_marches/51st_highland_division/notes.pipes.ily
@@ -5,19 +5,27 @@ composerPipes = ""
 pipeglobal = {
 	\bagpipeKey
 	}
-pipesAA = {
+pipesAAA = {
 	\dble e8. [ c16 ] |
 	a4 \taor a8. [ b16 ] \dblc c8 [ \gre b8 ] \dblc c8 [ e8 ] |
 	\dblA A8. [ g16 ] \hdblf f8 [ e8 ] \dblf f4 \grg e8 [ \grg f16 g16 ] |
+}
+pipesAAB = {
 	\dblA A8. [ g16 ] \hdblf f8 [ e8 ] \grg f8 [ A8 ] a8. [ b16 ] |
 	\grip c8 [ f8 ] \dble e8. [ c16 ] \slurd b4 \dble e8. [ c16 ] |
 }
-pipesAB = {
+pipesABA = {
 	a4 \taor a8. [ b16 ] \dblc c8 [ \gre b8 ] \dblc c8 [ e8 ] |
 	\dblA A8. [ g16 ] \hdblf f8 [ e8 ] \dblf f4 \grg e8 [ \grg f16 g16 ] |
+}
+pipesABB = {
 	\dblA A8. [ g16 ] \hdblf f8 [ e8 ] \grg f8 [ A8 ] \hdblc c8 [ \gre b8 ] |
 	\dblc c4 \gre a4 \wbirl a4
 }
+pipesAA = {
+	\pipesAAA
+	\pipesAAB
+}
 
 pipesBA = {
 	\dblc c8 [ e8 ] |
diff --git a/4-4_marches/51st_highland_division/notes.side.ily b/4-4_marches/51st_highland_division/notes.side.ily
index 9bd3a1f..defaa9d 100644
--- a/4-4_marches/51st_highland_division/notes.side.ily
+++ b/4-4_marches/51st_highland_division/notes.side.ily
@@ -8,7 +8,7 @@ sideglobal = {
 %%music
 snareA = \drummode {
 	d16. g32 |
-	d4:32(		d8.) g16		\flamd d8 d8:32(		g8) d8:32( |
+	d4:32(		d8.) g16		\flamd d8[ d8:32(]		g8[) d8:32(] |
 	g8.) g16		\flamd d8 \flamg g8		d4:32(->		d8.)-> g16 |
 }
 snareAA = \drummode {
@@ -16,7 +16,7 @@ snareAA = \drummode {
 	\flamg g4		d4:32(		d4) r8
 }
 snareAB = \drummode {
-	d8:32(-> g8)		\flamd d8 d8:32(		\tuplet 3/2 { g16) d g } \flamd d16. g32->		d16. d32 \flamg g8 |
+	d8:32(->[ g8)]		\flamd d8[ d8:32(]		\tuplet 3/2 { g16) d g } \flamd d16. g32->		d16. d32 \flamg g8 |
 	\flamg g4		d4:32(		d4) r8
 }
 % Part 2
diff --git a/4-4_marches/51st_highland_division/pipes.ly b/4-4_marches/51st_highland_division/pipes.ly
index bfecdab..2c859d9 100644
--- a/4-4_marches/51st_highland_division/pipes.ly
+++ b/4-4_marches/51st_highland_division/pipes.ly
@@ -39,8 +39,8 @@
 		\set Staff.midiInstrument = #"bagpipe"
 		%%Tune
 		\partial 4 
-		\repeat volta 2 { \pipesAA \pipesAB }
-		\repeat volta 2 { \pipesBA \pipesBB }
+		\repeat unfold 2 { \pipesAA \pipesAB }
+		\repeat unfold 2 { \pipesBA \pipesBB }
 	}
 	\midi { \confTempo }
 }
diff --git a/4-4_marches/51st_highland_division/side.ly b/4-4_marches/51st_highland_division/side.ly
index a37c360..268f959 100644
--- a/4-4_marches/51st_highland_division/side.ly
+++ b/4-4_marches/51st_highland_division/side.ly
@@ -8,21 +8,19 @@
         \global
         <<
 			{
-				\repeat unfold 2 {
 					\repeat volta 2 { \part \halfline \break}
 						\alternative { {\halfline} {\halfline } }
 						\bar "|." \break
 					\part \line \bar "||" \break
-					\line \bar "|."
-				}
+					\part \line \bar "|." \break
 			}
 			{
-			 s8 \snareA
-				\snareAA s8
-				\snareAB s8
+					s8 \snareA
+						\snareAA s8
+						\snareAB s8
 
-			 s8 \snareB
-			 \snareA \snareAB
+					 s8 \snareB s8
+					 s8 \snareA \snareAB
 			}
 		>>
 	}
diff --git a/4-4_marches/auld_lang_syne/config.ily b/4-4_marches/auld_lang_syne/config.ily
index 8e4cb2b..56d6e0f 100644
--- a/4-4_marches/auld_lang_syne/config.ily
+++ b/4-4_marches/auld_lang_syne/config.ily
@@ -7,7 +7,7 @@ confTempo = {
 	\tempo 4 = 90 
 	}
 %% Format
-part = { \partial 8 s8 }
+part = { \partial 4 \grace { s4 } s4 }
 measure = { \grace { s4 } s1 | }
 halfline = { \repeat unfold 2 { \measure } }
 line = { \repeat unfold 2 { \halfline } }
diff --git a/4-4_marches/auld_lang_syne/notes.pipes.ily b/4-4_marches/auld_lang_syne/notes.pipes.ily
index b8f13a0..52bd14b 100644
--- a/4-4_marches/auld_lang_syne/notes.pipes.ily
+++ b/4-4_marches/auld_lang_syne/notes.pipes.ily
@@ -15,11 +15,12 @@ pipesA = {
  \dble e4~ e8 [ c8 ] \gra c4 \gre a4 |
  \dblb b4~ b8 [ a8 ] \grg b4 \grg c8. [ b16 ] |
  \grg a4~ a8 [ f8 ] \grg f4 \grg e4 |
- \grg a2 \wbirl a4 f4
+ \grg a2 \wbirl a4
 }
 
 pipesB = 
 {
+ f4 |
  \dble e4~ e8 [ c8 ] \gra c4 \gre a4 |
  \dblb b4~ b8 [ a8 ] \grg b4 f4 |
  \dble e4~ e8 [ c8 ] \grg c4 e4 |
diff --git a/4-4_marches/auld_lang_syne/pipes.ly b/4-4_marches/auld_lang_syne/pipes.ly
index 63d724f..937720c 100644
--- a/4-4_marches/auld_lang_syne/pipes.ly
+++ b/4-4_marches/auld_lang_syne/pipes.ly
@@ -10,7 +10,8 @@
 		<<
 			{
 			\repeat volta 2 { \part \line }
-			\repeat volta 2 { \line }
+			\break
+			\repeat volta 2 { \part \line }
 			}
 			{
 			\pipesA s4
diff --git a/4-4_marches/bonnie_galloway/pipes.ly b/4-4_marches/bonnie_galloway/pipes.ly
index b96d935..38ab7b9 100644
--- a/4-4_marches/bonnie_galloway/pipes.ly
+++ b/4-4_marches/bonnie_galloway/pipes.ly
@@ -11,8 +11,6 @@
 			{ 
 			\line \break
 			\line \break
-			\line \break
-			\line \break
 			}
 			{
 				\pipesA
diff --git a/4-4_marches/crusaders_march/config.ily b/4-4_marches/crusaders_march/config.ily
index 591d56f..069b833 100644
--- a/4-4_marches/crusaders_march/config.ily
+++ b/4-4_marches/crusaders_march/config.ily
@@ -7,7 +7,7 @@ confTempo = {
 	\tempo 4 = 80 
 	}
 %% Format
-part = { \partial 8 s8 }
+part = { \partial 4 s4 }
 measure = { \grace { s4 } s1 | }
 halfline = { \repeat unfold 2 { \measure } }
 line = { \repeat unfold 2 { \halfline } }
diff --git a/4-4_marches/crusaders_march/notes.pipes.ily b/4-4_marches/crusaders_march/notes.pipes.ily
index 660f200..386ba33 100644
--- a/4-4_marches/crusaders_march/notes.pipes.ily
+++ b/4-4_marches/crusaders_march/notes.pipes.ily
@@ -15,7 +15,7 @@ pipesA = {
 	\grg c4 \grip c4 \dblc c4 \gre a8. [ \grd c16 ]  |
 	\dble e4 \grip e8. [ f16 ] \dble e4 \thrwd d8 [ f8 ]  |
 	\dble e8 [ c8 ] \dbld d8 [ b8 ] \dblc c8 [ e8 ] \thrwd d8 [ b8 ]  |
-	\dblb b8 [ \gre a8 ] \wbirl a8. [ b16 ] \grG a4 \grg a16 [ b16 \grip c16 d16 ] 
+	\dblb b8 [ \gre a8 ] \wbirl a8. [ b16 ] \grG a4 \grg a16 [ b16 \grip c16 d16 ]  |
 }
 pipesB = {
 	\dble e4 \gra e8. [ f16 ] \dble e8 [ d8 ] \dblc c8 [ \gre b8 ]  |
diff --git a/4-4_marches/crusaders_march/pipes.ly b/4-4_marches/crusaders_march/pipes.ly
index 02aa4cf..f04b60e 100644
--- a/4-4_marches/crusaders_march/pipes.ly
+++ b/4-4_marches/crusaders_march/pipes.ly
@@ -9,15 +9,12 @@
 		\pipeglobal
 		<<
 			{
-				\part
-				\line \break
-				\line \break 
-		
-				\line 
-				\line \break
+				\part 	\line \bar "|."
+				\break
+				\line \bar "|."
 			}
 			{
-				\pipesA
+				\pipesA 
 
 				\pipesB
 			}
diff --git a/4-4_marches/scotland_the_brave/high-full.ly b/4-4_marches/scotland_the_brave/high-full.ly
index 17eda9a..78b3ca7 100644
--- a/4-4_marches/scotland_the_brave/high-full.ly
+++ b/4-4_marches/scotland_the_brave/high-full.ly
@@ -55,7 +55,7 @@
 %		}
 	>>
 	\header {
-		title = \title
+		title = {\title " (high)"}
 		meter = \meter
 		composer = \markup \large {
 			\column \right-align {
diff --git a/4-4_marches/wings/side.ly b/4-4_marches/wings/side.ly
index 025f155..f77013d 100644
--- a/4-4_marches/wings/side.ly
+++ b/4-4_marches/wings/side.ly
@@ -10,16 +10,15 @@
 			{
 				\partial 8 s8
 				\repeat volta 2 {
-					s1 | s1
+					\halfline
 				}
 				\alternative {
-					{ s1 | s1 }
-					{ s1 | s2^"Fine" s4 s8 \bar "|."}
+					{ \halfline }
+					{ \measure | s2^"Fine" s4 s8 \bar "|."}
 				}
 				\partial 8 s8
-				s1
-				s1
-				s1
+				\halfline
+				\measure
 				s1^"D.C. al Fine" \bar "||"
 			}
 			{
@@ -36,4 +35,4 @@
 		instrument = \instrumentSide
 		composer = \composerSide
 	}
-}
\ No newline at end of file
+}
diff --git a/airs/abide_with_me/config.ily b/airs/abide_with_me/config.ily
index 9e59ebe..6db3425 100644
--- a/airs/abide_with_me/config.ily
+++ b/airs/abide_with_me/config.ily
@@ -6,9 +6,10 @@ global = {
 
 %% Format
 part = { \partial 8 s8 }
-halfline = { \repeat unfold 4 { s1 | } }
+measure = { \grace { s4 } s1 | }
+halfline = { \repeat unfold 2 { \measure } }
 line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
 title = "Abide with Me"
-meter = "Hymn"
\ No newline at end of file
+meter = "Hymn"
diff --git a/airs/alexander_mackenzie/30 Alexander MacKenzie.bww b/airs/alexander_mackenzie/30 Alexander MacKenzie.bww
deleted file mode 100644
index aac5d47..0000000
--- a/airs/alexander_mackenzie/30 Alexander MacKenzie.bww	
+++ /dev/null
@@ -1,92 +0,0 @@
-Bagpipe Reader:1.0
-
-MIDINoteMappings,(54,56,58,59,61,63,64,66,68,56,58,60,61,63,65,66,68,70,55,57,59,60,62,64,65,67,69)
-
-FrequencyMappings,(370,415,466,494,554,622,659,740,831,415,466,523,554,622,699,740,831,932,392,440,494,523,587,659,699,784,880)
-
-InstrumentMappings,(71,71,45,33,1000,60,70)
-
-GracenoteDurations,(20,40,30,50,100,200,800,1200,250,250,250,500,200)
-
-FontSizes,(110,110,88,80,200)
-
-TuneFormat,(1,0,F,L,500,500,500,250,L,0,0)
-
-TuneTempo,40
-
-"Alexander MacKenzie",(T,L,0,0,Times New Roman,16,700,0,0,18,0,0,0)
-
-"Slow March",(Y,C,0,0,Times New Roman,14,400,0,0,18,0,0,0)
-
-"",(M,R,0,0,Times New Roman,14,400,0,0,18,0,0,0)
-
-"The Seaforth Highlanders of Canada and Holland",(F,R,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-"30",(F,C,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-"oktober 2013",(F,L,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-& sharpf sharpc 6_8 I!'' gg Er_16 'e Dl_32
-!	dbc Cr_8 eg LAl_8 'la Bl_16			gg LA_4 gg LA_8
-!	gg Fr_8 HAl_8 'ha Fl_16				dbe E_4 'e
-!	HA_4 hdbe Er_16 'e Dl_32			dbc Cr_8 Bl_8 strlg LAl_8
-!	gg C_4  gg Cr_16 'c Dl_32			dbb B_4	gg LAr_16 'la Bl_32
-!t
-& sharpf sharpc 
-	dbc Cr_8 eg LAl_8 'la Bl_16						gg LA_4 gg LA_8
-!	gg Fr_8 HAl_8 'ha Fl_16							dbe E_4  gg LAr_16 'la Bl_32
-!	gg Cr_32 El_16 'e ^ts HAl_8 HAr_16 'ha ^te  Cl_32		gg B_8 dg C_4
-!	grpb LA_4 'la 									brl LA_4
-''!I
-& sharpf sharpc I!'' E_8
-!	gg B_4 gg Br_16 'b Cl_32						thrd Dr_8 gg Fl_8 El_8
-!	gg LA_4 gg Cr_16 'c Dl_32						dbe E_4 'e
-!	gg B_4 gg Br_16 'b Cl_32						thrd Dr_8 gg Fl_8 'f El_16
-!	strla E_4 'e									dbe E_4 '1 gg E_8
-!t
-& sharpf sharpc  
-	gg B_4 gg Br_16 'b Cl_32						thrd Dr_8 gg Fl_8 El_8
-!	gg LA_4 gg Cr_16 'c Dl_32						dbe E_4  gg LAr_16 'la Bl_32
-!	gg Cr_32 El_16 'e ^ts HAl_8 HAr_16 'ha ^te  Cl_32		gg B_8 dg C_4
-!	grpb LA_4 'la 									brl LA_4 _' 
-''!I
-& sharpf sharpc '2 gg LAr_16 'la Bl_32
-!	dbc Cr_8 eg LAl_8 'la Bl_16						gg LA_4 gg LA_8
-!	gg Fr_8 HAl_8 'ha Fl_16							dbe E_4  gg LAr_16 'la Bl_32
-!	gg Cr_32 El_16 'e ^ts HAl_8 HAr_16 'ha ^te  Cl_32		gg B_8 dg C_4
-!	grpb LA_4 'la 									brl LA_4 _' 
-!I
-
-
-
-"Seconds",(I,L,0,0,Times New Roman,11,700,0,0,18,0,0,0)
-
-
-
-& sharpf sharpc 6_8 I!'' gg Cr_16 'c Fl_32
-!	dbe Er_8 gg Cl_8 'c Dl_16			gg C_4 gg C_8
-!	gg Dr_8 Fl_8 'f Dl_16				dbc C_4 'c
-!	F_4 gg Cr_16 'c Bl_32				dbe Er_8 Dl_8 Cl_8
-!	dbe E_4  gg Er_16 'e Fl_32			thrd D_4	gg Cr_16 'c Dl_32
-!t
-& sharpf sharpc 
-	dbe Er_8 gg Cl_8 'c Dl_16			gg C_4 gg C_8
-!	gg Dr_8 Fl_8 'f Dl_16				dbc C_4   gg Cr_16 'c Dl_32
-!	gg LAr_32 Cl_16 'c gg ^ts Fl_8 Fr_16 'f ^te  LAl_32		gg Dr_8  El_8 'e Dl_16
-!	dbc C_4 'c 									grp C_4
-''!I
-& sharpf sharpc I!'' gg C_8
-!	gg D_4 gg Dr_16 'd El_32						gg Fr_8 Dl_8 Cl_8
-!	gg C_4 gg Er_16 'e Fl_32						dbc C_4 'c
-!	gg D_4 gg Dr_16 'd El_32						gg Fr_8 Dl_8 'd Cl_16
-!	strlg C_4 'c									dbc C_4 '1 gg C_8
-!t
-& sharpf sharpc  
-	gg D_4 gg Dr_16 'd El_32						gg Fr_8 Dl_8 Cl_8
-!	gg C_4 gg Er_16 'e Fl_32						dbc C_4   gg Cr_16 'c Dl_32
-!	gg LAr_32 Cl_16 'c gg ^ts Fl_8 Fr_16 'f ^te  LAl_32		gg Dr_8  El_8 'e Dl_16
-!	dbc C_4 'c 									grp C_4 _' 
-''!I
-& sharpf sharpc '2  gg Cr_16 'c Dl_32
-!	dbe Er_8 gg Cl_8 'c Dl_16			gg C_4 gg C_8
-!	gg Dr_8 Fl_8 'f Dl_16				dbc C_4   gg Cr_16 'c Dl_32
-!	gg LAr_32 Cl_16 'c gg ^ts Fl_8 Fr_16 'f ^te  LAl_32		gg Dr_8  El_8 'e Dl_16
-!	dbc C_4 'c 									grp C_4 _' 
-!I
\ No newline at end of file
diff --git a/airs/alexander_mackenzie/config.ily b/airs/alexander_mackenzie/config.ily
index 51fa66c..5972beb 100644
--- a/airs/alexander_mackenzie/config.ily
+++ b/airs/alexander_mackenzie/config.ily
@@ -3,6 +3,9 @@
 global = {
 	\time 6/8
 	}
+confTempo = {
+	\tempo 2. = 90
+}
 
 %% Format
 part = { \partial 8 s8 }
@@ -11,4 +14,4 @@ line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
 title = "Alexander MacKenzie"
-meter = "Slow March"
\ No newline at end of file
+meter = "Slow March"
diff --git a/airs/amazing_grace/config.ily b/airs/amazing_grace/config.ily
index f632530..39ad9d0 100644
--- a/airs/amazing_grace/config.ily
+++ b/airs/amazing_grace/config.ily
@@ -3,12 +3,15 @@
 global = {
 	\time 3/4
 	}
-
+confTempo = {
+	\tempo 4 = 60
+	}
 %% Format
 part = { \partial 4 s4 }
-halfline = { \repeat unfold 2 { s4*3 | } }
+measure = { \grace { s4 } s4*3 | }
+halfline = { \repeat unfold 2 { \measure } }
 line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
 title = "Amazing Grace"
-meter = "Hymn"
\ No newline at end of file
+meter = "Hymn"
diff --git a/hornpipes/itchy_fingers/config.ily b/hornpipes/itchy_fingers/config.ily
index 33db2fe..2c19d3a 100644
--- a/hornpipes/itchy_fingers/config.ily
+++ b/hornpipes/itchy_fingers/config.ily
@@ -7,9 +7,10 @@ global = {
 
 %% Format
 part = { \partial 8 s8 }
-halfline = { \repeat unfold 4 { s2 | } }
+measure = { \grace { s4 } s2 | }
+halfline = { \repeat unfold 4 { \measure } }
 line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
 title = "Itchy Fingers"
-meter = "Hornpipe"
\ No newline at end of file
+meter = "Hornpipe"
diff --git a/hornpipes/the_walrus/config.ily b/hornpipes/the_walrus/config.ily
index 2aeefd0..6c94cb5 100644
--- a/hornpipes/the_walrus/config.ily
+++ b/hornpipes/the_walrus/config.ily
@@ -4,8 +4,9 @@ global = {
 	\time 2/4
 	}
 %% Format
-part = { \partial 8 s8 }
-halfline = { \repeat unfold 4 { s2 | } }
+part = { \partial 8 \grace { s4 } s8 }
+measure = { \grace { s4 } s2 | }
+halfline = { \repeat unfold 4 { \measure } }
 line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
diff --git a/reels/jock_wilsons_ball/bass.ly b/reels/jock_wilsons_ball/bass.ly
index c56c8d0..90227c2 100644
--- a/reels/jock_wilsons_ball/bass.ly
+++ b/reels/jock_wilsons_ball/bass.ly
@@ -8,8 +8,18 @@
         \global
 	\bassglobal
 		<<
-			{ }%Format
-			{ }
+			{
+				\line 
+				\bar "|."
+				\break
+				\line
+				\bar "|."
+			}%Format
+			{
+			\bassA
+
+			\bassB
+			}
 		>>
 	}
 	\header {
diff --git a/reels/jock_wilsons_ball/config.ily b/reels/jock_wilsons_ball/config.ily
index 3287e6e..fdbbcd3 100644
--- a/reels/jock_wilsons_ball/config.ily
+++ b/reels/jock_wilsons_ball/config.ily
@@ -8,7 +8,8 @@ confTempo = {
 	}
 %% Format
 part = { \partial 8 s8 }
-halfline = { \repeat unfold 4 { s1 | } }
+measure = { \grace{s1} s2 s2 | }
+halfline = { \repeat unfold 4 { \measure } }
 line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
diff --git a/reels/jock_wilsons_ball/drums.ly b/reels/jock_wilsons_ball/drums.ly
index dbfe2f0..4a7fff8 100644
--- a/reels/jock_wilsons_ball/drums.ly
+++ b/reels/jock_wilsons_ball/drums.ly
@@ -14,21 +14,35 @@
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
 
 			<<
-				{ }%Format
-				{ }%Music
+				{
+					\partial 16 s16
+					\line
+					\bar "|."
+					\break
+					\partial 16 s16
+					\line
+					\bar "|."
+				}%Format
+				{ 
+					\sideA s16
+					\sideB
+				}%Music
 			>>
 		}
 		\new PipeBandDrumStaff = "tenor" {
 			\tenorglobal
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
-
+			s16 \tenorA
+			s16 \tenorB
 		}
 		\new PipeBandDrumStaff = "bass" {
 			\bassglobal
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
 
+			s16 \bassA
+			s16 \bassB
 		}
 	>>
 	\header {
diff --git a/reels/jock_wilsons_ball/full.ly b/reels/jock_wilsons_ball/full.ly
index 9f29ae6..e38326a 100644
--- a/reels/jock_wilsons_ball/full.ly
+++ b/reels/jock_wilsons_ball/full.ly
@@ -19,7 +19,7 @@
 				{
 				\partial 16 s16
 				\line
-				\bar "||"
+				\bar "|,"
 
 				\break
 				\line
diff --git a/reels/jock_wilsons_ball/notes.side.ily b/reels/jock_wilsons_ball/notes.side.ily
index ce89f30..c87d3e8 100644
--- a/reels/jock_wilsons_ball/notes.side.ily
+++ b/reels/jock_wilsons_ball/notes.side.ily
@@ -6,49 +6,63 @@ sideglobal = {
 	\eighthReelBeaming
 }
 % Music
-sideA = \drummode {
-	g16 |
-	\flam d4	\flam g8. g16
+sideAAmain = \drummode {
+		\flam g8. g16
 	d8.:32(  d16)->	g8. g16 
 	|
 	\flam d8. [ \drag g16	d32 g d g d8 ]
 	g8. [ \drag d16		d8. g16 ]
 	|
-	\flam d8. [ \drag g16 ]	d32 g d g d8 ]
+}
+sideAAA = \drummode {
+	g16 |
+	\flam d4 \sideAAmain
+}
+sideABA = \drummode {
+	d4) \sideAAmain
+}
+sideAAB = \drummode {
+	\flam d8. [ \drag g16	d32 g d g d8 ]
 	g8.:32->([  d16)	g8. g16 ]
 	|
-	\triplet {d8 [  d g } d16 g32 g ]
-	d8 [  g32 d g d g8-> d8. d16:64( ]
+	\triplet {d8 [  d g } d16 g32 g d8 ]
+	g32 [ d g d g8-> d8. d16:64( ]
 	|
+}
 
-	d4) 	\flam g8. g16 
-	d8.:32([  d16)->	g8. g16 ]
-	|
-	\flam d8.[  \drag g16	d32 g d g d8 ]
-	g8.[  \drag d16		d8. g16 ]
-	|
+sideABB = \drummode {
 	\flam d32[  d g8.		d16 g8. ]
 	d4:32(	 d8.) g16
 	|
 	\triplet {d8[  g d }	\flam g8. \drag g16 ]
-	d32  g d g d8	g8.
+	d32 [ g d g d8	g8. ]
+}
+sideA = \drummode {
+	\sideAAA
+	\sideAAB
+	\sideABA
+	\sideABB
 }
 
-sideB = \drummode {
+
+
+
+sideBA = \drummode {
 	g16 |
 	\flam d4  g4:32(
 	d8.:32)(-> g16) \flam d8. g16  
 	|
-	\flamd \triplet { d8[  g8 \flam d8 } \flam g8 \triplet { d16 g d ]} 
+	\flamd \triplet { d8[ g \flam d } \flam g8 \triplet { d16 g d ]} 
 	g8.[  \drag d16		d8. g16 ]
 	|
 	\flam d4  g4:32(	
 	d8.:32)(-> g16) \flam d8. g16  
 	|
-	\triplet { d8 [ d g } d16 g32 g]
-	d8[  g32 d g d g8-> d8. d16:64( ]
-	
+	\triplet { d8 [ d g } d16 g32 g d8]
+	g32 [ d g d g8-> d8. d16:64( ]
 	|
+}
+sideBB = \drummode {
 	d4)  g4:32(
 	d8.:32()-> g16) \flam d8. g16  
 	|
@@ -59,6 +73,10 @@ sideB = \drummode {
 	d4:32(	d8.) g16
 	|
 	d8.:32( g16) d8. g16
-	d16 g8.:32(	d4)
-
+	d16 g8.:32(	d8.)
+}
+
+sideB = \drummode {
+	\sideBA
+	\sideBB
 }
diff --git a/reels/jock_wilsons_ball/pipes.ly b/reels/jock_wilsons_ball/pipes.ly
index f984dc6..a7b2958 100644
--- a/reels/jock_wilsons_ball/pipes.ly
+++ b/reels/jock_wilsons_ball/pipes.ly
@@ -9,11 +9,16 @@
 		\pipeglobal
 		<<
 			{ 
-				\bar ".|"
-				\line 
-				\bar "|.|" 
+				\halfline
 				\break
-				\line \bar "|."
+				\halfline
+				\bar "|."
+				\break
+
+				\halfline 
+				\break
+				\halfline
+				\bar "|."
 			}%Format
 			{ 
 				\pipesAA
diff --git a/reels/jock_wilsons_ball/side.ly b/reels/jock_wilsons_ball/side.ly
index b751572..3120dd3 100644
--- a/reels/jock_wilsons_ball/side.ly
+++ b/reels/jock_wilsons_ball/side.ly
@@ -10,12 +10,16 @@
 		<<
 			{ 
 				\partial 16 s16
-				\line
-				\bar "||"
+				\halfline
+				\break
+				\halfline
+				\bar "|."
 
 				\break
 				\partial 16 s16
-				\line
+				\halfline
+				\break
+				\halfline
 				\bar "|."
 			}%Format
 			{
diff --git a/reels/jock_wilsons_ball/tenor.ly b/reels/jock_wilsons_ball/tenor.ly
index 1c3acd1..d0311e4 100644
--- a/reels/jock_wilsons_ball/tenor.ly
+++ b/reels/jock_wilsons_ball/tenor.ly
@@ -10,7 +10,7 @@
 	<<
 			{
 				\line 
-				\bar "||"
+				\bar "|."
 				\break
 				\line
 				\bar "|."
diff --git a/reels/the_mackenzies_reel/config.ily b/reels/the_mackenzies_reel/config.ily
index 6eea4b2..7dd4e12 100644
--- a/reels/the_mackenzies_reel/config.ily
+++ b/reels/the_mackenzies_reel/config.ily
@@ -5,7 +5,8 @@ global = {
 	}
 %% Format
 part = { \partial 8 s8 }
-halfline = { \repeat unfold 2 { s1 | } }
+measure = { \grace {s1} s2 s2 | }
+halfline = { \repeat unfold 4 { \measure } }
 line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
diff --git a/reels/the_mackenzies_reel/full.ly b/reels/the_mackenzies_reel/full.ly
index 4656f76..3f8732d 100644
--- a/reels/the_mackenzies_reel/full.ly
+++ b/reels/the_mackenzies_reel/full.ly
@@ -15,12 +15,12 @@
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
 			<<
 				{
-					\repeat volta 2 { \part \line } \break
-			
-					\part \line \bar "||" \break
-					\line \bar "|."
+					\part \halfline \bar "||" \halfline \bar "|."
+					\break
+					\part \halfline \bar "||" \halfline \bar "|."
 				}%Format
 				{
+					\pipesA
 					\pipesA s8
 
 					\pipesBA
@@ -33,10 +33,9 @@
 			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
 
-			r16. \snareA s16
+			r8 \snareA 
 			
-			r16. \snareBA 
-			\snareBB
+			r8 \snareB s8
 		}
 %		\new PipeBandDrumStaff = "bass" {
 %			\bassglobal
diff --git a/reels/the_mackenzies_reel/notes.side.ily b/reels/the_mackenzies_reel/notes.side.ily
index 1eb1afc..1b08bb9 100644
--- a/reels/the_mackenzies_reel/notes.side.ily
+++ b/reels/the_mackenzies_reel/notes.side.ily
@@ -2,35 +2,28 @@
 % Side
 \version "2.18.2"
 composerSide = "C. Ooms, 2016"
-sideglobal = { \eighthBeaming}
+sideglobal = { \eighthReelBeaming}
 
 snareA = \drummode {
-	\flam d8 d16. g32	d8:32~ g16. g32 
-	\triplet { d16 g d } \flam g16. g32	d16. g32 d16.:64~ d32 |
-	g8 d16. g32	d32 g d g d16. g32 
-	\flam d16. g32 d16. \flam g32	d16. \flam g32 d16. g32 |
+	\flam d4 d8. g16	d4:32~ g8. g16 
+	\triplet { d8 g d } \flam g8. g16	d8. g16 d8.:32~ d16 |
+	g4 d8. g16	d16 g d g d8. g16 
+	\flam d8. g16 d8. \flam g16	d8. \flam g16 d8. g16 |
 
 
-	\flam d8 d16. g32	d8:32~ g16. g32 
-	\triplet { d16 g d } \flam g16. g32	d16. g32 d16.:64~ d32 | 
-	g16.-> g32 d16. g32	\triplet { d16 d g } d16 g32 g 
-	d16.-> g32 d16. g32->	d32 g d g d16.-> g32 |
+	\flam d4 d8. g16	d4:32~ g8. g16 
+	\triplet { d8 g d } \flam g8. g16	d8. g16 d8.:32~ d16 | 
+	g8.-> g16 d8. g16	\triplet { d8 d g } d8 g16 g 
+	d8.-> g16 d8. g16->	d16 g d g d8.-> g16 |
 }
 snareB = \drummode {
-	\flam d16. g32 d16. \flam g32	d16. g32 d32 g d g 
-	d16. g32 d16. g32:128(->	g16:64 d8:32)(-> g16) |
-	d8-> d16. g32		d32 g d g d16. g32 
-	\triplet { d16 d g } \triplet { d16 d g }	d16. \flam g32 d16. g32 |
+	\flam d8. g16 d8. \flam g16	d8. g16 d16 g d g 
+	d8. g16 d8. g16:64(->	g8:32 d4:32)(-> g8) |
+	d4-> d8. g16		d16 g d g d8. g16 
+	\triplet { d8 d g } \triplet { d8 d g }	d8. \flam g16 d8. g16 |
 
-	\flam d16. g32 d16. \flam g32	d16. g32 d32 g d g 
-	d16. g32 d16. g32:128(->	g16:64 d8:32)(-> g16) |
-	d16. g32 d16. g32	\triplet { d16 d g } d16 g32 g 
-}
-snareBA = \drummode {
-	\snareB
-	d16.-> g32 d16. g32->	d32 g d g d16. |
-}
-snareBB = \drummode {
-	\snareB
-	d16.-> g32 d16. g32->	d32 g d g d8
+	\flam d8. g16 d8. \flam g16	d8. g16 d16 g d g 
+	d8. g16 d8. g16:64(->	g8:32 d4:32)(-> g8) |
+	d8. g16 d8. g16	\triplet { d8 d g } d8 g16 g 
+	d8.[-> g16 d8. g16]->	d16[ g d g] d8
 }
diff --git a/reels/the_mackenzies_reel/side.ly b/reels/the_mackenzies_reel/side.ly
index 8dd9e15..c65e15d 100644
--- a/reels/the_mackenzies_reel/side.ly
+++ b/reels/the_mackenzies_reel/side.ly
@@ -9,13 +9,16 @@
 	\sideglobal
 		<<
 			{ 
-			  \repeat volta 2 {\line } \break
-			  \repeat volta 2 { \line }
+			  \line
+			  \bar "|."
+			  \break
+			  \line
+			  \bar "|."
 			}
 			{ 
 			  \snareA
 
-			  \snareBB
+			  \snareB
 			 }
 		>>
 	}
diff --git a/strathspeys/aa_camerons/config.ily b/strathspeys/aa_camerons/config.ily
index 2f9ab87..1395dda 100644
--- a/strathspeys/aa_camerons/config.ily
+++ b/strathspeys/aa_camerons/config.ily
@@ -6,9 +6,10 @@ global = {
 
 %% Format
 part = { \partial 8 s8 }
-halfline = { \repeat unfold 2 { s1 | } }
+measure = { \grace { s4 } s1 | }
+halfline = { \repeat unfold 2 { \measure } }
 line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
 title = "A. A. Cameron's Strathspey"
-meter = "Strathspey"
\ No newline at end of file
+meter = "Strathspey"
diff --git a/strathspeys/aa_camerons/side.ly b/strathspeys/aa_camerons/side.ly
index c23854f..c7c9876 100644
--- a/strathspeys/aa_camerons/side.ly
+++ b/strathspeys/aa_camerons/side.ly
@@ -9,11 +9,11 @@
         <<
 			{
 			\repeat unfold 2 {
-				\repeat volta 2 { \halfline	}
-					\alternative {
-						{\halfline}
-						{\halfline }
-					}
+				\line
+				\bar "||"
+				\break
+				\line
+				\bar "|."
 				\break
 				}
 			\bar "|."
@@ -21,11 +21,13 @@
 			{
 			\snareAA
 			\snareABA
+			\snareAA
 			\snareABB
 
 
 			\snareBA
 			\snareBBA
+			\snareBA
 			\snareBBB
 			}
 		>>
@@ -36,4 +38,4 @@
 		instrument = \instrumentSide
 		composer = \composerSide
 	}
-}
\ No newline at end of file
+}
diff --git a/strathspeys/lady_mackenzie_of_fairburn/config.ily b/strathspeys/lady_mackenzie_of_fairburn/config.ily
index 7e6cbd3..a51dcd8 100644
--- a/strathspeys/lady_mackenzie_of_fairburn/config.ily
+++ b/strathspeys/lady_mackenzie_of_fairburn/config.ily
@@ -6,7 +6,9 @@ global = {
 confTempo = { \tempo 4 = 108 }
 %% Format
 part = { \partial 16 s16 }
-line = { \repeat unfold 4 { s1 | } }
+measure = { \grace{s4} s1 | }
+halfline = { \repeat unfold 2 { \measure } }
+line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
 title = "Lady MacKenzie of Fairburn"
diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily
index 1dad7a2..3046b2a 100644
--- a/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily
+++ b/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily
@@ -13,15 +13,15 @@ snareA = \drummode {
 	d8.:32(-> \dr g16:64)(->
 	d4)
 	|
-	\triplet { \drag d8 d g }
+	\dragd \triplet { d8 d g }
 	\flam d8. \fr g16 ->
 	\triplet { d16\< g d g d8 }
 	g16\! d8.
 	|
 	d8.[:32(\< \dr  g16]:32)(-> \>
 	d8.[:32)( g16]:32)(-> \<
-	d8.[:32)( g16]:32)(->
-	d8.) \! \fr
+	d8.[:32)( g16]:32)->
+	d8. \! \fr
 }
 snareBA = \drummode{
 	g16 |
diff --git a/strathspeys/lady_mackenzie_of_fairburn/side.ly b/strathspeys/lady_mackenzie_of_fairburn/side.ly
index e82ac70..733b551 100644
--- a/strathspeys/lady_mackenzie_of_fairburn/side.ly
+++ b/strathspeys/lady_mackenzie_of_fairburn/side.ly
@@ -7,8 +7,18 @@
     \new PipeBandDrumStaff {
         \global
         <<
-			{\repeat volta 2 { \line } \break \part \line \bar "||" \break \line \bar "|."}
-			{\snareA s16 \snareBA \snareBB}
+			{
+			 \repeat volta 2 { \line } 
+			 \break 
+			 \part \line \bar "||" 
+			 \break
+			 \part \line \bar "|."
+			}
+			{
+			 \snareA s16 
+			 \snareBA s16 
+			 \snareBB
+			}
 		>>
 	}
 	\header {
@@ -17,4 +27,4 @@
 		instrument = \instrumentSide
 		composer = \composerSide
 	}
-}
\ No newline at end of file
+}
diff --git a/strathspeys/molly_connell/config.ily b/strathspeys/molly_connell/config.ily
index dd5b34b..4737de9 100644
--- a/strathspeys/molly_connell/config.ily
+++ b/strathspeys/molly_connell/config.ily
@@ -6,7 +6,7 @@ global = {
 	}
 %% Format
 part = { \partial 8 s8 }
-measure = { \grace {s1} s1 | }
+measure = { \grace {s4} s1 | }
 halfline = { \repeat unfold 2 { \measure } }
 line = { \repeat unfold 2 { \halfline } }