diff --git a/.gitignore b/.gitignore
index 0bc45fd..eb0973e 100755
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.png
 *.log
 *tmp*
-bwwtolily.py
+*.py
 _output/
 pdf/
+fullscores/*
diff --git a/2-4_marches/black_bear.ly b/2-4_marches/black_bear.ly
deleted file mode 100644
index a034c77..0000000
--- a/2-4_marches/black_bear.ly
+++ /dev/null
@@ -1,50 +0,0 @@
-\version "2.18.2"
-
-\include "lilydrum.ly"
-
-\score {
-	\drums {
-		\time 2/4
-
-		% Part 1
-			\repeat volta 2 {
-				\partial 8 d8:32( |
-				g16.) \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 |
-				\flamd d16. \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 |
-				\flamd d8 d32 g32 d32 g32 d4 |
-				r4^\markup {\bold HOI} d8:32( g8:32)(-> |
-
-				\break
-
-				d16.) \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 |
-				\flamd d16. \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 |
-				\flamd d4 d4:32( |
-				d8) \flamg g8 \flamd d8
-
-			}
-
-			\break
-
-		% Part 2 ( Part 2.2 = Part 1)
-				d8
-				d4:32( d4:32)( |
-				d8) g16. d32-> g16. g32 \flamd d16. g32 |
-				d4:32( d4:32)( |
-				d8) g16. d32-> g16. g32 \flamd d16. g32 |
-
-				\break
-
-				d4:32( d8.:32)( g16:32)( |
-				d8:32)( g8:32)( d4)( |
-				g8:32)( d8:32)( g16.) d32-> g16. g32 |
-				\flamd d8 d8:32( g8) \bar "|."
-
-	}% End of drums %
-}
-
-\header {
-	title = "Black Bear"
-	meter = "March"
-	composer = "E.T. de Boone, 2015"
-	instrument = "Side"
-}
\ No newline at end of file
diff --git a/2-4_marches/mackenzie_highlanders.side.ly b/2-4_marches/mackenzie_highlanders.side.ly
index 001a352..fc71f5e 100755
--- a/2-4_marches/mackenzie_highlanders.side.ly
+++ b/2-4_marches/mackenzie_highlanders.side.ly
@@ -1,8 +1,3 @@
-\version "2.18.2"
-
-
-\include "lilydrum.ly"
-
 \score {
 	\new DrumStaff = "staff_side" {
 		\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
@@ -15,10 +10,10 @@
 		\drummode {
 			\repeat volta 2{
 				\partial 8 d8:32( |
-				g8) \tuplet 3/2 { d16 g d } 	\flam g16. d32-> g16. g32 |
+				g8) \tuplet 3/2 { \backstick  d16 g d } 	\flam g16. d32-> g16. g32 |
 				\flam d8 d8:32(	g8:32)(-> \tuplet 3/2 { d16) g d } |
 
-				\flam g8[ \drag d16. d32]->		g16.[ \drag d32 d16. g32] |
+				\flam g8 \drag d16. d32->		g16. \drag d32 d16. g32 |
 				d4:32(		d8) d8:32( |
 
 				g8) \tuplet 3/2 { d16 g d } 	\flam g16. d32-> g16. g32 |
@@ -45,10 +40,8 @@
 			}
 		}
 	}
-
-}
-
 	\header {
 		title = "MacKenzie Highlanders"
 		meter = "March"
-	}
\ No newline at end of file
+	}
+}
\ No newline at end of file
diff --git a/4-4_marches/rowan_tree.ly b/4-4_marches/rowan_tree.ly
deleted file mode 100644
index ecce472..0000000
--- a/4-4_marches/rowan_tree.ly
+++ /dev/null
@@ -1,33 +0,0 @@
-\version "2.18.2"
-
-\include "lilydrum.ly"
-
-\score {
-    \drums {
-        \time 4/4
-
-        % Part 1
-		\repeat volta 2 {
-		\partial 4
-				r8 d8^"Part 2 of 2" |
-				d4:32(	d8) g8	d4:32(	d8) g8 |
-				\flamd d8 g16. d32->	g16. g32 \flamd d16. g32	\flamd d16. d32:128( d16.) g32->	d32 g d \flamd d g8 |
-				\flamd d8 d8:32(	g8) d8:32(	\tuplet 3/2 { g16) d g } \flamd d16. g32	d16. g32-> d g d \flamd d |
-				d4	d4:32(	d4) 
-		}
-	\break
-        % Part 2 ( Part 2.2 = Part 1)
-				d8. g16 |
-				d8:32(-> g8:32)(->	g8:32)( d8:32)(->	g8:32)( d8:32)(->	g8)-> d8:32( |
-				g8.) g16	d8:32( g8)	\flamd d8 d8:32(	g8.) g16 |
-				\flamd d8 d8:32(	g8) d8:32(	\tuplet 3/2 { g16) d g } \flamd d16. g32	d16. g32-> d g d \flamd d |
-				d4	d4:32(	d4)
-    }% End of drums %
-}
-
-\header {
-    title = "Rowan Tree"
-    meter = "Quick March"
-    composer = ""
-    instrument = "Side"
-}
diff --git a/4-4_marches/scotland_the_brave.ly b/4-4_marches/scotland_the_brave.ly
deleted file mode 100644
index a5eded7..0000000
--- a/4-4_marches/scotland_the_brave.ly
+++ /dev/null
@@ -1,36 +0,0 @@
-\version "2.18.2"
-
-\include "lilydrum.ly"
-
-#(set-default-paper-size "a4landscape")
-\score {
-    \drums {
-        \time 4/4
-
-        % Part 1
-            \repeat volta 2 {
-				\partial 8 d8:32( |
-				g8.) g16	d8:32( g8)	\flamd d8 d8:32(	g8) d8:32( |
-				\tuplet 3/2 { g16) d g } \flamd d16. g32	\tuplet 3/2 { d16 g d } \flamg g16. g32	d16. g32 \tuplet 3/2 { d16 g d }	\flamg g8 d8:32( |
-				g8.) g16	d8:32( g8)	\flamd d8 d8:32(	\tuplet 3/2 { g16) d g } d8 |
-				\flamd d4	d4:32(	d4)	r8
-			}
-
-			\break
-
-        % Part 2 ( Part 2.2 = Part 1)
-				g8 |
-				d4:32(	d8) g8	d4:32(	d8) g8:32( |
-				\tuplet 3/2 { g16) d g } \flamd d16. g32	\tuplet 3/2 { d16 g d } \flamg g16. g32	d16. g32 \tuplet 3/2 { d16 g d }	\flamg g8 d8 |
-				d4:32(	d8) g8	d4:32(	d8) g8 |
-				\flamd d4	d4:32(	d4)	r8
-
-    }% End of drums %
-}
-
-\header {
-    title = "Scotland the Brave"
-    meter = "Quick March"
-    composer = ""
-    instrument = "Side"
-}
diff --git a/TODO b/TODO
index c577211..41f2f2e 100755
--- a/TODO
+++ b/TODO
@@ -4,12 +4,12 @@ TODO
  * Macro for "Part 2 of $n"
  * If 8/16/32/..th notes come before a flam, they have a flag instead of a beam (fixable by explicit beaming, but rather have a good autobeaming)
  * A tuplet beginning with a flam has a strange tuplet beam (slanted)
- * It's custormary to have 4 bars per line for portrait and 8 for landscape...
+ * It's customary to have 4 bars per line for portrait and 8 for landscape...
 
  * TEMPLATING
    Find a nice filing system for easy saving, editing, generation of the scores
    *** script to easily generate the scores
-	   should be able to generate single instrument scores aswell as full drumscores,
+	   should be able to generate single instrument scores aswell as full drumscores (side, tenor, bass),
 	   and possibly fullscores (with the pipetune)
 	   from referenced files
    *** templates
@@ -21,10 +21,10 @@ TODO
 	backstick			white triangle pointing down
 
 
- * FLOURISHING			short	note	above-note
-	regular flourish	\fl		cross
-	ups					\up				arrow-up
-	scoop				\scoop			arrow-right-(diag-up\diag-down)
-	split the feather	\stf			xcircle
-	cartwheel			\cart
-	(EUSPBA symbols)
\ No newline at end of file
+ * FLOURISHING			short	long			note	above-note
+	regular flourish	\fl		\flourish		cross
+	ups					\up								arrow-up
+	scoop				\scoop							arrow-right-(diag-up\diag-down) [propably start on beginning of note and filter out the last one]
+	split the feather	\stf	\splitTheFeather		xcircle
+	cartwheel			\cart	\cartwheel
+	(further EUSPBA symbols)
\ No newline at end of file
diff --git a/airs/alexander_mackenzie.ly b/airs/alexander_mackenzie.ly
deleted file mode 100644
index 5a54e84..0000000
--- a/airs/alexander_mackenzie.ly
+++ /dev/null
@@ -1,50 +0,0 @@
-\version "2.18.2"
-
-\include "lilydrum.ly"
-
-\score {
-    \drums {
-        \time 6/8
-
-        % Part 1
-            \repeat volta 2 {
-				\partial 8 d16. g32 |
-				d8:32( d8.)-> g16 d4:32( d8) |
-				\dragd d16. d32-> g16. g32 \flamd d8 d4.:32( |
-				d4) d16. g32 d8:32( d8) g8 |
-				\flamd d16. g32 d16. \flamg g32 d16. g32 \flamd d4 d16. g32 |
-
-				\break
-
-				d8:32( d8.)-> g16 d4:32( d8) |
-				\dragd d16. d32-> g16. g32 \flamd d8 d4:32( d16.) g32 |
-				d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 |
-				d4.:32( d4)
-
-			}
-
-			\break
-
-        % Part 2 ( Part 2.2 = Part 1)
-				d8:32(
-				g4) \flamd d16. g32 d8:32( g8) \flamd d8 |
-				d32-> g32 d32 g32 d32 g32 d32 g32-> d32 g32 d32 g32  d4-> d8:32( |
-				g4) \flamd d16. g32 d8:32( g8.) g16 |
-				d4.:32( d4) d8:32( |
-
-				\break
-
-				g4) \flamd d16. g32 d8:32( g8) \flamd d8 |
-				d32-> g32 d32 g32 d32 g32 d32 g32-> d32 g32 d32 g32 d4-> \flamd d16. g32 |
-				d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 |
-				d4.:32( d4)
-
-    }% End of drums %
-}
-
-\header {
-    title = "Alexander MacKenzie"
-    meter = "Slow March"
-    composer = "E.T. de Boone, 2015"
-    instrument = "Side"
-}
\ No newline at end of file
diff --git a/airs/flower_of_scotland.ly b/airs/flower_of_scotland.ly
new file mode 100755
index 0000000..1876c05
--- /dev/null
+++ b/airs/flower_of_scotland.ly
@@ -0,0 +1,39 @@
+\score {
+	\new DrumStaff = "staff_side" {
+		\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
+		\set Staff.instrumentName = #"Side"
+		\set Staff.shortInstrumentName = #"S.D."
+
+		\time 6/8
+
+		\drummode {
+			\repeat volta 2 {
+				\partial 8 g8 |
+				\flam d8 d:32( g)	\flam d8 g16. d32 g16. g32 |
+				d4.:32( d4.) |
+				\flam d8 d:32( g)	\flam d8 g16. d32 g16. g32 |
+				\flam d8 g16. d32 g16. g32	\flam d8 g d |
+			\break
+				d4.:32( d4.) |
+				\flam d8 g16. d32 g16. g32	\flam d8 g d |
+				\flam d8 d:32( g)	\flam d8 g16. d32 g16. g32 |
+				\flam d8 g16. d32 g16. g32	\flam d8 g d |
+			\break
+				\flam d8 d:32( g)	\flam d8 g16. d32 g16. g32 |
+				d4.:32( d4.) |
+				\flam d8 d:32( g)	\flam d8 g16. d32 g16. g32 |
+				d4.:32( d4.) |
+			\break
+				\flam d8 d:32( g)	\flam d8 g16. d32 g16. g32 |
+				d4.:32( d4.) |
+				\flam d8 d:32( g)	\flam d8 g16. d32 g16. g32 |
+				\flam d8 g16. d32 g16. g32	\flam d4 |
+
+			}
+		}
+	}
+	\header {
+		title = "Flower of Scotland"
+		meter = "Air"
+	}
+}
\ No newline at end of file
diff --git a/lilydrum.ly b/lilydrum.ly
index 6372fae..9dfb364 100755
--- a/lilydrum.ly
+++ b/lilydrum.ly
@@ -127,7 +127,7 @@ eighthBeaming = {
 }
 sixteenthBeaming = {
   \set Score.baseMoment = #(ly:make-moment 1 16)
-  \set Score.beatStructure = #'( 4 4 4 4 )
+  \set Score.beatStructure = #'( 4)
 }
 
 \layout{
@@ -181,6 +181,12 @@ flourish = #(define-music-function (parser location notes) (ly:music?)
 					$notes
 					\revert Staff.NoteHead.style
 				#})
+splitTheFeather = #(define-music-function (parser location notes) (ly:music?)
+				#{
+					\temporary \override Staff.NoteHead.style = #'xcircle
+					$notes
+					\revert Staff.NoteHead.style
+				#})
 
 % =================================================	%
 % 	Functions										%
diff --git a/standards/standards.bass.ly b/standards/standards.bass.ly
index c5202ea..e9384ad 100755
--- a/standards/standards.bass.ly
+++ b/standards/standards.bass.ly
@@ -1,13 +1,7 @@
 \version "2.18.2"
 
-\include "lilydrum2.ly"
+\include "lilydrum.ly"
 
-\header {
-	meter = "March"
-	instrument = "Bass"
-}
-
-\markup "2/4 Standards"
 \score {
 	\new DrumStaff {
 		\time 2/4
@@ -17,62 +11,8 @@
 	}
 
 	\header {
-		title = "2/4 Standards"
-	}
-}
-
-\markup "3/4 Standards"
-\score {
-	\new DrumStaff {
-		\time 3/4
-
-		\repeat volta 2 {
-			\repeat unfold 4 { d4-> g4  d4 }
-		}
-	}
-
-	\header {
-		title = "3/4 Standards"
-	}
-}
-
-\markup "4/4 Standards"
-\score {
-	\new DrumStaff {
-		\time 4/4
-		\numericTimeSignature
-
-		\repeat volta 2 {
-			\repeat unfold 3 { d4-^ g4 d4-> g4 }
-			d4-^ g4 d4 r4 |
-		}
-	}
-
-	\header {
-		title = "4/4 Standards"
-	}
-}
-
-\markup "6/8 Standards"
-\score {
-	\new DrumStaff {
-		\time 6/8
-
-        % Part 1
-		\repeat volta 2 {
-			d4. g4. |
-			d4. r4. |
-			d4. g4. |
-			d4. r4 g8 |
-			d4. g4. |
-			d4. r4. |
-			d4. g4. |
-			d4. r4. |
-
-		}
-	}
-
-	\header {
-		title = "6/8 Standards"
+		title = "Cullen Bay"
+		meter = "March"
+		instrument = "Bass"
 	}
 }
\ No newline at end of file
diff --git a/standards/standards.tenor.ly b/standards/standards.tenor.ly
index 8b8ed58..ecc58fb 100755
--- a/standards/standards.tenor.ly
+++ b/standards/standards.tenor.ly
@@ -3,17 +3,35 @@
 \include "lilydrum.ly"
 
 \header {
-	meter = "March"
 	instrument = "Tenor"
+	title = "Standards"
 }
 
-\markup "2/4 Standards"
 \score {
 	\drums {
 		\time 2/4
-		\repeat unfold 8 { d8-> g8  d8 g8 }
-		\break
-		\repeat unfold 8 { d4 g4}
+
+		\repeat volta 2 {
+			d8-> g  d g |
+			d8-> g  d g |
+			d8-> g  d g |
+			d8-> g  d g |
+			d8-> g  d g |
+			d8-> g  d g |
+			d8-> g  d g |
+			d4-> r  |
+			\bar "||"
+			\flourish {
+				d4 d |
+				g4 g |
+				d4 d |
+				g4 g |
+				d4 d |
+				g4 g |
+				d4 d |
+				g4 d |
+			}
+		}
 	}
 
 	\header {
@@ -21,13 +39,22 @@
 	}
 }
 
-\markup "3/4 Standards"
 \score {
 	\drums {
 		\time 3/4
 
 		\repeat volta 2 {
-			\repeat unfold 4 { d4-> g4  d4 }
+			d8.-> g16 d8 g r g |
+			d4-> d8 g d4 |
+			d8.-> g16 d8 g r g |
+			d4-> d8 g d4 |
+			\bar "||"
+			\flourish{
+				d4-> d d |
+				g4-> g g |
+				d4-> d g |
+				g4-> d g |
+			}
 		}
 	}
 
@@ -36,14 +63,22 @@
 	}
 }
 
-\markup "4/4 Standards"
 \score {
 	\drums {
 		\time 4/4
 
 		\repeat volta 2 {
-			\repeat unfold 3 { d8[-^ g8] 	d8[ g8]		d8[-> g8]  d8[ g8] }
-			d4-^ g4 d4 r4 |
+			d8-^ g d g d-> g d g |
+			d8-^ g d g d-> g d g |
+			d8-^ g d g d-> g d g |
+			d4-^ g d r |
+			\bar "||"
+			\flourish {
+				d4 d g g |
+				d4 d g g |
+				d4 d g g |
+			}
+			\flourish d4 \flourish g \splitTheFeather d r |
 		}
 	}
 
@@ -52,21 +87,30 @@
 	}
 }
 
-\markup "6/8 Standards"
 \score {
 	\drums {
 		\time 6/8
 
-        % Part 1
 		\repeat volta 2 {
-			d4. g4. |
-			d4. r4. |
-			d4. g4. |
-			d4. r4 g8 |
-			d4. g4. |
-			d4. r4. |
-			d4. g4. |
-			d4. r4. |
+			\flourish d4. \flourish g |
+			\splitTheFeather d r |
+			d g |
+			d8 r8 g8 d4. |
+			\flourish d4. \flourish g |
+			\splitTheFeather d r |
+			d g |
+			d8 r8 g8 d4. |
+			\bar "||"
+			\flourish {
+				d4. d |
+				g g |
+				d d |
+				g g |
+				d d |
+				g g |
+				d g |
+			}
+			\splitTheFeather d r |
 
 		}
 	}