diff --git a/2-4_marches/royal_scots_polka/notes.pipes.ily b/2-4_marches/royal_scots_polka/notes.pipes.ily
index 81b82f6..b147aa9 100644
--- a/2-4_marches/royal_scots_polka/notes.pipes.ily
+++ b/2-4_marches/royal_scots_polka/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = "W. Denholm"
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key d \major
 }
 % Music
 pipesA = {
diff --git a/airs/flower_of_scotland/bass.ly b/airs/flower_of_scotland/bass.ly
new file mode 100644
index 0000000..42f7f14
--- /dev/null
+++ b/airs/flower_of_scotland/bass.ly
@@ -0,0 +1,32 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.bass.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+        \global
+		\bassglobal
+		<<
+			\new NullVoice = "format"
+			{
+
+				\repeat volta 2 {
+					\repeat unfold 2 { \line \line \break }
+				}
+			}%Format
+			\new DrumVoice {
+				\bassA
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentBass
+		composer = \composerBass
+		arranger = \arrangerBass
+	}
+}
diff --git a/airs/flower_of_scotland/drums.ly b/airs/flower_of_scotland/drums.ly
new file mode 100644
index 0000000..e73c441
--- /dev/null
+++ b/airs/flower_of_scotland/drums.ly
@@ -0,0 +1,69 @@
+\version "2.19.0"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.bass.ily"
+%\include "./notes.tenor.ily"
+\include "./notes.side.ily"
+
+
+\layout {
+	indent = 5.0
+	short-indent = 2.0
+}
+
+\score {
+	\new StaffGroup <<
+		\new PipeBandDrumStaff = "side" \with {
+			instrumentName = \markup{ \instrumentSide }
+			shortInstrumentName = \markup{ \shortInstrumentSide }
+		} {
+			\global
+			\sideglobal
+			<<
+				\new NullVoice = "format" {
+					\repeat volta 2 {
+						\part
+						\repeat unfold 2 { \line \line \break }
+					}
+				}%End of Format
+				\new DrumVoice = "side" {
+					\snareA s8
+				}%End of side
+			>>
+		}
+%{		\new PipeBandDrumStaff = "tenor" \with {
+			instrumentName = \markup{ \instrumentTenor }
+			shortInstrumentName = \markup{ \shortInstrumentTenor }
+		} {
+			\tenorglobal
+
+		}
+%}
+		\new PipeBandDrumStaff = "bass" \with {
+			instrumentName = \markup{ \instrumentBass }
+			shortInstrumentName = \markup{ \shortInstrumentBass}
+		} {
+			\bassglobal
+
+			s8 \bassA
+		}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup {
+			\column \right-align {
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \composerSide  ":" }} #} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
+			}
+			\column \right-align {
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
+			}
+		}
+	}
+}
diff --git a/airs/flower_of_scotland/full.ly b/airs/flower_of_scotland/full.ly
index 0d10e1d..26879d4 100644
--- a/airs/flower_of_scotland/full.ly
+++ b/airs/flower_of_scotland/full.ly
@@ -4,7 +4,7 @@
 \include "lilydrum.ly"
 
 \include "./config.ily"
-%\include "./notes.bass.ily"
+\include "./notes.bass.ily"
 %\include "./notes.tenor.ily"
 \include "./notes.side.ily"
 \include "./notes.pipes.ily"
@@ -59,12 +59,13 @@
 %			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
 %
 %		}
-%		\new PipeBandDrumStaff = "bass" {
-%			\bassglobal
-%			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
-%			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
-%
-%		}
+		\new PipeBandDrumStaff = "bass" {
+			\bassglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+
+			s8 \bassA
+		}
 	>>
 	\header {
 		title = \title
diff --git a/airs/flower_of_scotland/notes.bass.ily b/airs/flower_of_scotland/notes.bass.ily
new file mode 100644
index 0000000..c84c59d
--- /dev/null
+++ b/airs/flower_of_scotland/notes.bass.ily
@@ -0,0 +1,31 @@
+% 6/8 Flower of Scotland
+% Bass
+\version "2.18.2"
+composerBass  = "E.T. de Boone, 2019"
+arrangerBass  = ""
+bassglobal = {}
+% Music
+bassA = \drummode {
+	|
+	d4. g4. |
+	d4. r4 g8 |
+	d4 d8 g4. |
+	d4. d4 g8 |
+	d4. g4 
+	
+	g8|
+	d4 d8 g4.
+	d4. g4 g8 |
+	d4. g4 g8|
+	d4 g8 d4. |
+	g4. r4
+
+	g8 |
+	d4 g8 d4. |
+	d4. r4 g8 |
+	d4 g8 d4. |
+	g4. r4
+	g8 |
+	d4 d8 g4. |
+	d4. g4. |
+}
diff --git a/airs/flower_of_scotland/notes.side.ily b/airs/flower_of_scotland/notes.side.ily
index 1465530..0e7dab4 100644
--- a/airs/flower_of_scotland/notes.side.ily
+++ b/airs/flower_of_scotland/notes.side.ily
@@ -1,7 +1,7 @@
 % 6/8 Flower of Scotland
 % Side
 \version "2.18.2"
-composerSide = ""
+composerSide = "E.T. de Boone, 2017"
 sideglobal = { \eighthCompoundBeaming } 
 snareA = \drummode {
 	g8 |
diff --git a/hornpipes/the_walrus/notes.pipes.ily b/hornpipes/the_walrus/notes.pipes.ily
index 9fb2e4a..f8fd927 100644
--- a/hornpipes/the_walrus/notes.pipes.ily
+++ b/hornpipes/the_walrus/notes.pipes.ily
@@ -47,13 +47,13 @@ pipesCA = {
 	\dble e8 [ g16 e16 ] \grg d16 [ b16 \grg c16 d16 ] | \break
 }
 pipesCBA = {
-	\grg e16 [ a16 \grg a16 \grd a16 ] A16 [ a16 \grg a16 g16 ] |
+	\grg e16 [ a16 \grg a16 \grd a16 ] A16 [ a16 \grg a16 g16 ]~ |
 	g16 [ a16 \grg f16 a16 ] \dble e8 [ \grg d16 b16 ] |
 	\grg G16 [ \grd G16 \grg b16 d16 ] \grg e16 [ d16 \grg b16 \grd G16 ] |
 	\grg a8 [ \wbirl a8 ] \grg a8
 }
 pipesCBB = {
-	\grg e16 [ a16 \grg a16 \grd a16 ] A16 [ a16 \grg a16 g16 ] |
+	\grg e16 [ a16 \grg a16 \grd a16 ] A16 [ a16 \grg a16 g16 ]~ |
 	g16 [ a16 \grg f16 a16 ] \dble e8 [ \grg d16 b16 ] |
 	\grg d16 [ \slurc d16 \grg e16 f16 ] \grA g16 [ f16 \grg e16 d16 ] |
 	\grg e8 [ \gra e8 ] \dble e8
@@ -73,8 +73,8 @@ pipesDBA = {
 	\grg a8 [ \wbirl a8 ] \grg a8
 }
 pipesDBB = {
-	\grg e16 [ a16 \grg a16 \grd a16 ] A16 [ a16 \grg a16 g16 ] |
+	\grg e16 [ a16 \grg a16 \grd a16 ] A16 [ a16 \grg a16 g16 ]~ |
 	g16 [ a16 \grg f16 a16 ] \dble e8 [ \grg d16 b16 ] |
 	\grg G16 [ \grd G16 \grg b16 d16 ] \grg e16 [ d16 \grg b16 \grd G16 ] |
-	\grg a8 [ \wbirl a8 ] \grg a4
+	\grg a8 [ \wbirl a8 ] \grg a8
 }
diff --git a/hornpipes/the_walrus/pipes.ly b/hornpipes/the_walrus/pipes.ly
index 6b95e5b..fdc9b6b 100644
--- a/hornpipes/the_walrus/pipes.ly
+++ b/hornpipes/the_walrus/pipes.ly
@@ -22,6 +22,8 @@
 				\repeat volta 2 { \part \halfline}
 				\alternative{ {\halfline} {\halfline}}
 
+				\bar "|."
+
 			}
 			{
 				\pipesA s8
diff --git a/suites/steam_train_to_mallaig/notes.pipes.ily b/suites/steam_train_to_mallaig/notes.pipes.ily
index a4ac73f..17b1c5e 100644
--- a/suites/steam_train_to_mallaig/notes.pipes.ily
+++ b/suites/steam_train_to_mallaig/notes.pipes.ily
@@ -4,7 +4,7 @@
 composerPipes = "Mary-Ann MacKinnon"
 arrangerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+	\key a \mixolydian
 }
 % Music
 pipesIntro = {
@@ -92,4 +92,4 @@ pipesF = {
 	\thrwd d4~ d4~ |
 	d16  \grg G16 G16  \gre G16  \grg a4~ |
 	a4~ a4
-}
\ No newline at end of file
+}