diff --git a/Session/ALaModeDeFrance.abc b/Session/ALaModeDeFrance.abc
index e0a5ea6..7886800 100644
--- a/Session/ALaModeDeFrance.abc
+++ b/Session/ALaModeDeFrance.abc
@@ -6,8 +6,6 @@ M: C
 L: 1/4
 Q: 160
 K: Gmaj
-P: A
 "D" d | "D" d B c d | "G" B>A G d | "G" d B c d | "G" B3 :|
-P: B
-|: "G" B | "D" A F G A | "G" B>A G B | "D" A F G A | "G" B3 B |
+"G" B | "D" A F G A | "G" B>A G B | "D" A F G A | "G" B3 B |
 "D" A F G A | "G" B>A G d | "D" d B c d | "G" B3 :|
diff --git a/Session/AllInAGardenGreen.abc b/Session/AllInAGardenGreen.abc
index efa1659..b45f608 100644
--- a/Session/AllInAGardenGreen.abc
+++ b/Session/AllInAGardenGreen.abc
@@ -10,8 +10,8 @@ M:2/2
 L:1/8
 Q:1/2=90
 K:G
-P:A
-|:"G"d4 "D"d2d2|"Em"B2>c2 "G"d2d2|"C"e2d2 "Am"c2B2|"D"A6 B2|"C"c3 def g2|"G"G3 ABc d2|"Am"c2B2 "D7"AGAB|"G"G8:|
-P:B
-|:"G"d2dd d2d2|"C"e2 "D7"f2 "G"g4|"Em"B2BB B2G2|"Am"A2B2 "D7"c4|"G"B3 AGA B2|
-"Am"c3 BAB c2|"Bm"d3 cBc d2|"C"e3 dcdBc|"Am"A2G2 "D"G2F2|"G"G8:|
+"G" d4 "D" d2d2 | "Em"B2>c2 "G" d2d2 |"C"e2d2 "Am"c2B2 |\
+"D" A6 B2 | "C" c3 def g2 | "G" G3 ABc d2 | "Am"c2B2 "D7" AGAB | "G" G8 :|
+"G" d2dd d2d2 | "C" e2 "D7" f2 "G" g4 | "Em" B2BB B2G2 |\
+"Am" A2B2 "D7" c4 | "G" B3 AGA B2 |
+"Am"c3 BAB c2 | "Bm" d3 cBc d2 | "C" e3 dcdBc | "Am" A2G2 "D" G2F2 | "G" G8 :|
diff --git a/Session/BearDance.abc b/Session/BearDance.abc
index 0d72fb4..dd0160a 100644
--- a/Session/BearDance.abc
+++ b/Session/BearDance.abc
@@ -6,7 +6,7 @@ M:2/4
 L:1/16
 Q:1/4=120
 K:Em
-|: "Em" B2 E2 E4| B2 E2 E3 F| G2G2F2G2|"D" A4G2A2|
+"Em" B2 E2 E4| B2 E2 E3 F| G2G2F2G2|"D" A4G2A2|
 |"Em" B2B2 "D" A2A2|"Em" G2G2 "D" F4|"Em" E2G2 "D" F2D2|"Em" E4 E4:|
-|: "Em" E2G2E2G2|"D" F2D2D4|"C" E2G2E2G2|"D" A4G2A2|
+"Em" E2G2E2G2|"D" F2D2D4|"C" E2G2E2G2|"D" A4G2A2|
 |"Em" B2B2 "D" A2A2|"C" G2G2 "D" F4|"Em" E2G2 "D" F2D2|"Em" E4 E4:|
diff --git a/Session/BonnyKate.abc b/Session/BonnyKate.abc
index 446310b..bcca4fb 100644
--- a/Session/BonnyKate.abc
+++ b/Session/BonnyKate.abc
@@ -8,7 +8,7 @@ Q: 180
 P: A
 d e f | "G" g>f g>f | "G" g d d B | "C" c/d/ e d>c |\
 "G" B G G>A | "Em" B G G A/B/ | "Am" c A A2 |
-"G" B/c/ d "D" c B | [1 "D" A :| [2 "D" A4 |]\
+"G" B/c/ d "D" c B | [1 "D" A :| [2 "D" A4 \
 P: B
 |: "G" B G2 A/B/ | "Am" c A "Bm" d B | "C" e c c e |
 "D" f2 d e/f/ | "G" g>f g f/e/ | "D" d e/f/ "G" g B |\
diff --git a/Session/BrightonCamp.abc b/Session/BrightonCamp.abc
index 2a05b3b..f68e9e1 100644
--- a/Session/BrightonCamp.abc
+++ b/Session/BrightonCamp.abc
@@ -10,10 +10,8 @@ M:4/4
 L:1/8
 Q:1/4=180
 K:G
-P:A
 gf| "G" e2dc B2A2 | "C" B2G2E2D2 | "G" G2G2GABc | "D7" d4B2gf|
     "G" e2dc B2A2 | "C" B2G2E2G2 | "D7" FG A2D2EF| "G" G4G2:|
-P:B
-|: dc | "G" B2d2 "D7" e2f2 | "G" g2dc "D7" BA G2 |\
+dc | "G" B2d2 "D7" e2f2 | "G" g2dc "D7" BA G2 |\
         "G" Bc d2 "Em" e2f2 | "C" g4 "D7" f2gf|
         "G" e2dc B2A2 | "C" B2G2E2G2 | "D7" FG A2D2EF | |"G" G4G2 :|
diff --git a/Session/CaptainRock.abc b/Session/CaptainRock.abc
index 1430f75..7da91d3 100644
--- a/Session/CaptainRock.abc
+++ b/Session/CaptainRock.abc
@@ -6,11 +6,9 @@ L: 1/4
 Q: 140
 R: Waltz
 K: Gmaj
-P: A
 D |: "G" G>AB | d>BA | "C" G>EC | "G" D/(G/G) D | "G" G>AB | d>BG |
 [1 "G" B/(d/d)B | "D" A2 D :|\
 [2 "D" A/(B/B) A | "G" G2 d |]
-P: B
 "G" d>Bd | "C" g>eg | "G" d>BG | B/(d/d) d | "G" d>Bd |
 "C" g>eg | "G" d>BG | "D" A2 D | "G" G>AB | d>BA |
 "C" G>EC | "G" D/(G/G)D | G>AB | d>BG | "D" A/(B/B) A | "G" G2 |]
diff --git a/Session/DearTobacco.abc b/Session/DearTobacco.abc
index b5ccf5c..40ef6a3 100644
--- a/Session/DearTobacco.abc
+++ b/Session/DearTobacco.abc
@@ -4,9 +4,7 @@ M: C|
 L: 1/4
 Q: 160
 K: Dmaj
-P: A
    "Em" B E E F | "G" G/F/E/D/ "D" F2 | "Em" B E E c | "G" d c B "D" A |
    "Em" B E E F | "G" G/F/E/D/ "D" F2 | "D" D>E D c | "G" d c B "D" A :|
-P: B
    "Em" B e e f | "D" g/f/e/d/ f2 | "Em" B e e f | "C" g e "D" f d |
    "G" B d d "A" e | "G" d/c/B/c/ d2 | "D" F A A F | "D" d c  :|
diff --git a/Session/ElizabethClare.abc b/Session/ElizabethClare.abc
index fccf81d..57d3374 100644
--- a/Session/ElizabethClare.abc
+++ b/Session/ElizabethClare.abc
@@ -7,13 +7,11 @@ L: 1/8
 R: waltz
 K: Gmaj
 Q: 1/4=120
-P: A
     D GA | "G" B2 Bc B2 |"D" A2ABA2 |"C" G2E2GE |"G" D2>D2 GA|\
 "G" B2 d2 e2 | d2 c2 B2 | d2 c2 B2 |
 "D" A2>D2 GA | "G" B2 Bc B2 | "D" A2ABA2 | "C" G2E2GE | "G" D2>D2 GA|\
 "G" B2 d2 e2 | d2 c2 B2 | "D" A2 G2 F2 | "G "G3 :|
-P: B
-    G Bd | "C" e2 d2>B2 | c2 B2 Bc | "G" d2 c2 B2 | "D" A4 B2 |\
+G Bd | "C" e2 d2>B2 | c2 B2 Bc | "G" d2 c2 B2 | "D" A4 B2 |\
 "C" c2 cd c2 | "G" B2 Bc B2 | "Am" A2 G2 E2 |
 "D" D2>D2 GA | "G" B2 Bc B2 | "D" A2 AB A2 | "C" G2 E2 GE |\
 "G" D2>D2 GA | "G" B2 d2 e2 | d2  c2 B2 | "D" A2 G2 F2 | "G" G3 :|
diff --git a/Session/FromNightTillMorn.abc b/Session/FromNightTillMorn.abc
index b35ee0f..8870664 100644
--- a/Session/FromNightTillMorn.abc
+++ b/Session/FromNightTillMorn.abc
@@ -4,9 +4,9 @@ M:4/4
 L:1/8
 Q:140
 K:G
-|: dc | "G" B2B2B2G2 | "D" AGAB "G" G2AB | "Am" cBAG "G" GABc | "D" d2ec B2dc |
+dc | "G" B2B2B2G2 | "D" AGAB "G" G2AB | "Am" cBAG "G" GABc | "D" d2ec B2dc |
         "G" B2B2B2G2 | "D" AGAB "G" G2AB | "Am" cBAG "G" GABG |\
          [1  "D" A4  "G" G2 :| [2 "D" A4 "G" G4 |]
-|: "G"  GABc "D" d2d2| "D" d2  e2  d4 | "C" e2d2 "G" g2B2 | "D" d2ec B2A2 |
+"G"  GABc "D" d2d2| "D" d2  e2  d4 | "C" e2d2 "G" g2B2 | "D" d2ec B2A2 |
         "G" B2B2B2G2 | "D" AGAB "G" G2AB | "Am" cBAG "G" GABc | "D" d2ec B2A2 |
         "G" B2B2B2G2 | "D" AGAB "G" G2AB | "Am" cBAG "G" GABG | "D" A4 "G" G4 :|
diff --git a/Session/GatheringPeascods.abc b/Session/GatheringPeascods.abc
index 9942f0a..9f0e722 100644
--- a/Session/GatheringPeascods.abc
+++ b/Session/GatheringPeascods.abc
@@ -8,12 +8,9 @@ R:Reel
 P:(ABC)3
 K:G
 Q:1/2=116
-P:A
-|: "G" d4 d2 d2 | B3 c d2 d2 | "C" e2 d2 c2 B2 |\
-   "D" A6 B2 | A2 G2 G2 F2 | [1 "G" G6 :| [2 "G" G6 G2 ||
-P:B
-|: "D" F2 D2 F2 G2 | A4 B2 A2 | "G" GA B2 A2 G2 |\
+"G" d4 d2 d2 | B3 c d2 d2 | "C" e2 d2 c2 B2 |\
+   "D" A6 B2 | A2 G2 G2 F2 | [1 "G" G6 :| [2 "G" G6 G2 |]
+"D" F2 D2 F2 G2 | A4 B2 A2 | "G" GA B2 A2 G2 |\
    "D/F#m" F6 F2 | "A" E2 D2 E3 D  | "D" D6 d2 :|
-P:C
-|: "G" B2 G2 G2 AB | "C" c6 c2 | "G" B2 G2 G2 AB | "C" c6 d2 |\
+"G" B2 G2 G2 AB | "C" c6 c2 | "G" B2 G2 G2 AB | "C" c6 d2 |\
    "G" B2 G2 G2 AB | "C" c3 d e2 dc | "G" B2 cB "D" A3 G  | "G" G6 G2 :|
diff --git a/Session/GrandfathersTune.abc b/Session/GrandfathersTune.abc
index 9b1b3b7..fea733c 100644
--- a/Session/GrandfathersTune.abc
+++ b/Session/GrandfathersTune.abc
@@ -6,11 +6,7 @@ R:Reel
 M:4/4
 Q:160
 K:D
-P:A
-"D" F2A2 "A" B2c2| "D" dcde f2 a2| "A" g2f2e2d2| "A" c2B2A2G2|\
-"D" F2A2 "A" B2c2| "D" dcde f2 a2|
-"A" g2f2e2 Bc|"D" d2f2 d4 :| |:\
-P:B
-"A" e4 e4  | "A" g2f2 e4 |
-"A" g2f2e2d2 | "A" c2B2A2G2|\
+"D" F2A2 "A" B2c2| "D" dcde f2 a2| "A" g2f2e2d2| "A" c2B2A2G2|
+"D" F2A2 "A" B2c2| "D" dcde f2 a2| "A" g2f2e2 Bc|"D" d2f2 d4 :|
+"A" e4 e4  | "A" g2f2 e4 | "A" g2f2e2d2 | "A" c2B2A2G2|
 "D" F2A2 "A" B2c2| "D" dcde f2 a2| "A" g2f2e2 Bc| "D" d2f2 d4:|
diff --git a/Session/HarpersFrolick.abc b/Session/HarpersFrolick.abc
index c51e057..5c8f7d3 100644
--- a/Session/HarpersFrolick.abc
+++ b/Session/HarpersFrolick.abc
@@ -9,5 +9,5 @@ Q:160
 K:D
 A/G/ | "D" F A/F/ D A/G/ | "D" F A/F/ Dd | "A" cdec | "D" d/c/d/e/ f A/G/ |
    | "D" F A/F/ D A/G/ | "D" F A/F/ Dd | "A" cdec | "D" d3 :|
-|: e | "D" f>e d/c/ d | "A" geeg | "D" fddf | "A" e/d/c/B/ A2 |
+e | "D" f>e d/c/ d | "A" geeg | "D" fddf | "A" e/d/c/B/ A2 |
      | "D" f>e d/c/ d | "A" geeg | "D" fd "A" ec | "D" d2 d :|
diff --git a/Session/HerbertTheSherbert.abc b/Session/HerbertTheSherbert.abc
index 607c718..6c12943 100644
--- a/Session/HerbertTheSherbert.abc
+++ b/Session/HerbertTheSherbert.abc
@@ -6,6 +6,6 @@ L:1/8
 Q:1/4=165
 K:Em
 "Em" E2 E "C" e3 |cBA "Em" B3 |GBA GFE | "D" FAG FED |
-"Em" E2 E "C" e3 |cBA "Em" B3 |GBA GFE | "D" AGF "Em" E3 :| |:
+"Em" E2 E "C" e3 |cBA "Em" B3 |GBA GFE | "D" AGF "Em" E3 :|
 "Em" EFG "D" F3 |"C" EFG "Bm" F3 | "Em" Bef gfe | "Bm" ded B3 |
 "D" ded A3 |ded "Em" G3 | Bde "G" dBG |"D" AGF "Em" E3 :|
diff --git a/Session/HorsesBrawl.abc b/Session/HorsesBrawl.abc
index 328f6de..2f971f1 100644
--- a/Session/HorsesBrawl.abc
+++ b/Session/HorsesBrawl.abc
@@ -10,7 +10,7 @@ Q:1/4=180
 K:G
 "G" G>A B B | "D" c B A c | "G" B A G F | "C" E2 "D" D2 |\
 "G" G>A B B | "D" c B A c | "Em" B G "D" A F | "G" G2 G2 :|
-|: "D" d c/B/ A "G" B | "D" c B/A/ "G" G/A/ B | "D" A G F "G" G | "D" A2 A2 |\
+"D" d c/B/ A "G" B | "D" c B/A/ "G" G/A/ B | "D" A G F "G" G | "D" A2 A2 |\
        d c/B/ A "G" B | "D" c B/A/ "G" G/A/ B | "D" A G G F | "G" G2 G2 :|
-|: "Em" _B A/G/ B A/G/ | "D" F G A2 | D E F G | A B A G |\
+"Em" _B A/G/ B A/G/ | "D" F G A2 | D E F G | A B A G |\
    "Em" _B A/G/ B A/G/ | "D" F G A2 | D E F G | G F "G" G2 :|
diff --git a/Session/JamieAllen.abc b/Session/JamieAllen.abc
index e868fe1..4413d9f 100644
--- a/Session/JamieAllen.abc
+++ b/Session/JamieAllen.abc
@@ -4,7 +4,7 @@ M: C
 L: 1/4
 Q: 160
 K: Gmaj
-|: G/A/ | "G" B G G A | B2 G A/B/ | "D7" c A A B | c2 B A |
+G/A/ | "G" B G G A | B2 G A/B/ | "D7" c A A B | c2 B A |
 "G" G g "C" g e | "G" d2 B B/c/ | "D7" d d c/B/ A | "G" G3 :|
-|: B/A/ | "G" G g g f | e d c B | "D7" A a a g | f d e f |
+B/A/ | "G" G g g f | e d c B | "D7" A a a g | f d e f |
 "G" g>a "C" g e | "G" d2 B B/c/ | "D7" d d c/B/ A | "G" G3 :|
diff --git a/Session/JustAsTheTideWasFlowing.abc b/Session/JustAsTheTideWasFlowing.abc
index 71ae507..5672739 100644
--- a/Session/JustAsTheTideWasFlowing.abc
+++ b/Session/JustAsTheTideWasFlowing.abc
@@ -6,13 +6,11 @@ L:1/4
 Q:160
 M:C
 K:G
-P:A
-|: D| "G" G G "C" E "D" D | "G" G G "D" A G/A/ |\
+D| "G" G G "C" E "D" D | "G" G G "D" A G/A/ |\
       "Em" B B B/A/G/A/ | "Em" B/A/G/F/ "C" E "D" D |
       "G" G G "C" E "D" D | "G" G G "D" A G/A/ |\
       "G" B B "D" c/B/A/G/ | "C" E "D" F "G" G :|
-P:B
-|: B/c/ | "Bm" d d d "C" e | "Bm" d d d "C" e |\
+B/c/ | "Bm" d d d "C" e | "Bm" d d d "C" e |\
           "G" d B B/A/G/A/ | "Em" B/A/G/F/ "C" E "D" D |
           "G" G G "C" E "D" D | "G" G G "D" A G/A/ |\
           "G" B B "D" c/B/A/G/ | "C" E "D" F "G" G :|
diff --git a/Session/KingOfTheFairies.abc b/Session/KingOfTheFairies.abc
index d31a9fc..a6ef00d 100644
--- a/Session/KingOfTheFairies.abc
+++ b/Session/KingOfTheFairies.abc
@@ -10,7 +10,7 @@ B,2 |\
 |: "Em" (ED)uEvF (GF)vGuA | B2B2 G3 A | B2E2 (EF)GE | "D" (FG)FE D3 B,2 |
 "Em" (ED)EF (GF)GA | (BA)(GB) "D" d3 c | "Em" B2E2 "Bm" (GF)(ED) |\
 [1 "Em" E6 B,2 :| [2 "Em" E6 z2 |]
-|: "Em" e2 e2 (Bd)uevf | (ga)vguf "C" e3 f | "Em" e2 B2 (BA)uBv^c |\
+"Em" e2 e2 (Bd)uevf | (ga)vguf "C" e3 f | "Em" e2 B2 (BA)uBv^c |\
 "Bm" (de)d^c (Bc) (3(dcB) | "Em" e2 B2 (Bd)ef |
 (ga)gf "C" e3 f | "Em" (gf) (3(efg) "D" (fe) (3(def) |\
 "Em" e2 (ed) e3 f | g2 z e "D" f2 z d | "Em" (ed)(B^c) "Bm" d3 e |
diff --git a/Session/LanigansBall.abc b/Session/LanigansBall.abc
index e6a9ecb..e3f7375 100644
--- a/Session/LanigansBall.abc
+++ b/Session/LanigansBall.abc
@@ -6,7 +6,7 @@ M:6/8
 L:1/8
 Q:3/8=120
 K:G
-|: "Em" E2E G2A|B2A Bcd| "D" D2D F2G|ABA AFD|
+"Em" E2E G2A|B2A Bcd| "D" D2D F2G|ABA AFD|
 "Em" E2E G2A|B2A Bcd|"Bm" eBB B2A| "Em" BEE E3:|
 "Em" e2f g2e|fag fed| "D" e2f gfe|fdB Bcd|
 "Em" e2f g2e|fag fed| "Bm" edB cBA|[1 "Em" BGE EDE:|[2 "Em" BGE E3|]
diff --git a/Session/Laride6.abc b/Session/Laride6.abc
index 09e6c61..5e80083 100644
--- a/Session/Laride6.abc
+++ b/Session/Laride6.abc
@@ -7,9 +7,7 @@ N: Change: BearDance.abc
 O:France
 A:Bretagne
 K:G
-P:A
 "Em" E2B2 | Ac B2 | "D" A> B A F | "Bm" G A B2 |
 "Em" E2B2 | Ac B2 | "D" A> B A F | "Em" G F E2 :|
-P:B
 "Em" E2 "G" G2 | GE "D" F2 | F A "Bm" A F | G A "Em" B2 |
 "Em" E2 "G" G2 | GE "D" F2 | F>G "Bm" A B | G F "Em" E2 :|
diff --git a/Session/LouthQuickstep.abc b/Session/LouthQuickstep.abc
index 8f11d70..0e8046c 100644
--- a/Session/LouthQuickstep.abc
+++ b/Session/LouthQuickstep.abc
@@ -7,9 +7,7 @@ M: 2/4
 K: G
 L: 1/8
 Q: 1/4=100
-P: A
 "G" BB/G/ Bd | "C" cA "D" A2 | "G" BG "D" FG | "C" A/G/F/E/ "D" D2 |
 "G" BB/G/ Bd | "C" cAAc | c/B/A/G/ "D" F/G/A/F/ | "G" GB G2 :|
-P: B
 "G" g2 "D" fe | ed "G" d2 | "C" e2 "D" dc | cB "G" B2 |
 "G" g2 "D" fe | eddc | "C" c/B/A/G/ "D" F/G/A/F/ | "G" GB G2 :|
diff --git a/Session/MazurkaDeLapleau.abc b/Session/MazurkaDeLapleau.abc
index 176f221..8370c3f 100644
--- a/Session/MazurkaDeLapleau.abc
+++ b/Session/MazurkaDeLapleau.abc
@@ -7,5 +7,5 @@ Q:130
 K:G
 "D" DG | "G" B2Bd BG | "G" B2Bd BG | "D" A2Ac BA | "G" B2G2DG|
          "G" B2Bd BG | "G" B2Bd BG | "D" A2Ac BA | "G" G4:|
-|: "D" dB | "G" GD GB dB | "C" c2A2cA | "D" FD FA cA | "G" B2G2dB |
+"D" dB | "G" GD GB dB | "C" c2A2cA | "D" FD FA cA | "G" B2G2dB |
             "G" GD GB dB | "C" c2A2cA | "D" FD FA cA | "G" G4:|
diff --git a/Session/MichaelTurnersWaltz.abc b/Session/MichaelTurnersWaltz.abc
index 96ed6cc..7abcd72 100644
--- a/Session/MichaelTurnersWaltz.abc
+++ b/Session/MichaelTurnersWaltz.abc
@@ -5,10 +5,8 @@ L: 1/8
 R: waltz
 Q: 140
 K: Gmaj
-P: A
-Z: Cry Havoc Booke of Dottes. Creative Commons by-sa 2.0 UK licenced.
-|:DGA | "G" B2 B2 "D" c2 | "G" d4 gf | "C" e2>f2 ge | "G" d2>"D" D2 GA |
+Z: Cry Havoc Booke of Dottes. Creative Commons by-nc-sa 2.0 UK licenced.
+DGA | "G" B2 B2 "D" c2 | "G" d4 gf | "C" e2>f2 ge | "G" d2>"D" D2 GA |
         "G" B2 B2 "D" c2 | "G" d2>e2 cA | "G" G3 B "D" AF | "G" G3 :|
-P: B
-|: zAB | "D" c2>d2 cB | "D" A4 Bc | "G" d2>e2 dc | "Em" B4 gf |
+AB | "D" c2>d2 cB | "D" A4 Bc | "G" d2>e2 dc | "Em" B4 gf |
          "C" e2>f2 ge | "G" d2>D2 GA | "G" B2 B2 "D" A2 | "G" G3 :|
diff --git a/Session/PlaneTree.abc b/Session/PlaneTree.abc
index 5fb105b..78aba26 100644
--- a/Session/PlaneTree.abc
+++ b/Session/PlaneTree.abc
@@ -8,7 +8,7 @@ L: 1/8
 R: jig
 Q: 140
 K: Emin
-|: "Em" EGB EGB| "Am" cBA "G" B2 B| "C" cde "D" dcB| "D" AGA "B" B2 B |
+"Em" EGB EGB| "Am" cBA "G" B2 B| "C" cde "D" dcB| "D" AGA "B" B2 B |
    "Em" EGB EGB| "Am" cBA "G" B2 B| "C" cde "D" dcB| "D" AGF "Em" E3:|
-|: "C" efg f2 e| "D" ded "G" B2 B | "C" cde "D" dcB| "D" AGA "Bm" B B|
+"C" efg f2 e| "D" ded "G" B2 B | "C" cde "D" dcB| "D" AGA "Bm" B B|
    "C" efg f2 e| "D" ded "G" B2 B | "C" cde "D" dcB| "B" AGF "Em" E3:|
diff --git a/Session/QuarterBrawls.abc b/Session/QuarterBrawls.abc
index 525981a..787c9a3 100644
--- a/Session/QuarterBrawls.abc
+++ b/Session/QuarterBrawls.abc
@@ -5,9 +5,10 @@ M: C
 L: 1/8
 Q: 140
 K: Gmaj
-"Em" B3 A "G" GFGA | "G" Bcdc "D" B2 A2 | "Em" B3 A "G" GFGA | "G" B2 d2 "D" A4 :|
-|: "G" Bcde dcBA | "G" B2 G2 G2 "C" c2 | "D" c2 B2 A4 :|
-|: "G" Bc d2 Bc d2 | "G" BcdB "D" c2 "G" B2 |\
+"Em" B3 A "G" GFGA | "G" Bcdc "D" B2 A2 | "Em" B3 A "G" GFGA |\
+   "G" B2 d2 "D" A4 :|
+"G" Bcde dcBA | "G" B2 G2 G2 "C" c2 | "D" c2 B2 A4 :|
+"G" Bc d2 Bc d2 | "G" BcdB "D" c2 "G" B2 |\
    "C" e3 d c2 "G" B2 | "C" e3 d c2 "G" B2 | "G" BcdB "D" cBAG |
    "D" FGAF "G" G2 dc | "G" B2 AG "D" A2 dc | "G" B2 A2 G2 dc |\
    "G" B2 AG "D" A2 dc | "G" B2 A2 G4 :|
diff --git a/Session/Railway.abc b/Session/Railway.abc
index fcbfabc..ba68906 100644
--- a/Session/Railway.abc
+++ b/Session/Railway.abc
@@ -6,5 +6,5 @@ Q: 160
 K: Gmaj
 D | "G" G2 G GBd | g2 d d2 d | "Am" e2 d c2 B | "D7" ABA FED |
     "G" G2 G GBd | g2 d d2 d | "C" edc "G" BAG | "D7" A3 "G" G2 :|
-|: d | "G" b2 b b2 a | g2 g g2 d | "C" e2 d efg | "D" a2 g fed |
+d | "G" b2 b b2 a | g2 g g2 d | "C" e2 d efg | "D" a2 g fed |
        "G" b2 b b2 a | g2 g g2 d | "C" efg "D" agf | "G" g3-g2 :|
diff --git a/Session/RochdaleCoconutDance.abc b/Session/RochdaleCoconutDance.abc
index a9eb2bb..ac9b211 100644
--- a/Session/RochdaleCoconutDance.abc
+++ b/Session/RochdaleCoconutDance.abc
@@ -3,14 +3,11 @@ T: Rochdale Coconut Dance
 S: Nick Barber
 M: C
 K: G
-P: (AB)3.A
 L: 1/4
 Q: 160
-P: A
-z | "G" GBGB | "D" A/G/F/G/ AB| "G" GBGB | "D" A/G/F/E/ D2 |
+"G" GBGB | "D" A/G/F/G/ AB| "G" GBGB | "D" A/G/F/E/ D2 |
     "G" GBGB | "D" A/G/F/G/ A d/c/ | "G" BB "D" A/B/c/A/ | "G" GBG :|
-P: B
-|: F | "Em" E/F/G/F/ EB | "Em" E/F/G/F/ EB |\
+F | "Em" E/F/G/F/ EB | "Em" E/F/G/F/ EB |\
        "Am" c A/c/ "G" B G/(A/| "D7" A/)G/ F "Em" E D |
  "Em" E/F/G/F/ EB | "Em" E/F/G/F/ EB | "Am" c A/c/ "G" B G/(A/|\
  "D7"A/)G/ F "Em" E :|
diff --git a/Session/SalmonTails.abc b/Session/SalmonTails.abc
index 0fdb6c3..cb4333a 100644
--- a/Session/SalmonTails.abc
+++ b/Session/SalmonTails.abc
@@ -11,4 +11,4 @@ B/A/ | "G"GE DE|G2 G3/2A/2| Bd AB/2A/2|"D"GE DE|"G"GE DE|"C" G2 G3/2A/2|\
 "G"Bd d2|"C"ce e2|"G"dB AB/2A/2|"D"GE D2|"G"Bd d2|"C"ce e3/2f/2|"G"gf ed\
 |"D7"ef "G"g2|
 "G"Bd d2|"C"ce e2|"G"dB AB/2A/2|"D"GE D2|"G"GE DE|"Em" G2 G3/2A/2|\
-"G"Bd "D7"AB/2A/2|"G"G2 G2||
+"G"Bd "D7"AB/2A/2|"G"G2 G2|]
diff --git a/Session/Sloe.abc b/Session/Sloe.abc
index a8383d0..543b5d4 100644
--- a/Session/Sloe.abc
+++ b/Session/Sloe.abc
@@ -6,5 +6,5 @@ Q:140
 K:D
 A2| "D" d3d d2 "A" e2 | "D" f2>e2 d2c2 | "G" B2A2 BcdB | "A" A2>G2 "D" F2A2 |
     "D" d3d d2 "A" e2 | "D" f2>e2 d2c2 | "G" B2A2 "A" B2c2 | "D" d6 :|
-|: A2| "D" B2A2 F2>A2 | B2A2 F2>A2| "D" d2c2 "A" c2B2 | B2A2 "D" A4 |
+A2| "D" B2A2 F2>A2 | B2A2 F2>A2| "D" d2c2 "A" c2B2 | B2A2 "D" A4 |
 "A" d2c2 c2e2 | "D" e2d2 d2f2 | "G" f2e2 "A" B2c2| "D" d4 d2 :|
diff --git a/Session/SoldiersJoy.abc b/Session/SoldiersJoy.abc
index 44fe7a0..35edb58 100644
--- a/Session/SoldiersJoy.abc
+++ b/Session/SoldiersJoy.abc
@@ -6,7 +6,7 @@ L: 1/8
 Q: 140
 R: hornpipe
 K: Dmaj
-|: FG | "D" AFDF AFDF|A2 d2 "G" d2 cB| "D" AFDF AFDF| "E7" G2E2 "A7" E2 FG|
+FG | "D" AFDF AFDF|A2 d2 "G" d2 cB| "D" AFDF AFDF| "E7" G2E2 "A7" E2 FG|
 | "D" AFDF AFDF|A2 d2 "G" d2 e2 | "D" fafd "A7" egec| "D" d2 d2 d2 :|
-|: de | "D" f2 f2 fagf| "A7" e2 e2 egfe| "D" f2 f2 fagf | "E7" edcB "A" A2 de|
-      | "D" f2 f2 fagf| "A7" e2 e2 egfe| "D" fafd "A7" egec| "D" d2 d2 d2 :||
+de | "D" f2 f2 fagf| "A7" e2 e2 egfe| "D" f2 f2 fagf | "E7" edcB "A" A2 de|
+      | "D" f2 f2 fagf| "A7" e2 e2 egfe| "D" fafd "A7" egec| "D" d2 d2 d2 :|]
diff --git a/Session/Springvals.abc b/Session/Springvals.abc
index 64f9094..adb46eb 100644
--- a/Session/Springvals.abc
+++ b/Session/Springvals.abc
@@ -8,5 +8,5 @@ Q: 130
 K: G
 "D" D>G B2 B2 | "G" BA (Ac) c2 | "D" AFDDEF | "G" G2 BG D2 |
 "D" D>G B2 B2 | "G" BA (Ac) c2 | "D" AFDDEF [1 "G" G3 z D2 :| [2 "G" G3 D GB |]
-|: "D" d2 c2 (B2|A) z "G" GG G2 | "D" (FA)(DF)(AF) | "G" (GB)(BD)(GB) |
+"D" d2 c2 (B2|A) z "G" GG G2 | "D" (FA)(DF)(AF) | "G" (GB)(BD)(GB) |
 "D" d2 c2 (B2|A) z "G" GG G | "D" (FA)(DF)AF | [1 "G" G3 D GB :| [2 "G" G2 |]
diff --git a/Session/ThemeVannetaise.abc b/Session/ThemeVannetaise.abc
index c09c8bf..b2dbc83 100644
--- a/Session/ThemeVannetaise.abc
+++ b/Session/ThemeVannetaise.abc
@@ -6,9 +6,7 @@ M: 4/4
 K: G
 L: 1/8
 Q: 140
-P: A
 "Em" E2 B2 B2 AB | G2 E2 E2 FG | "D" A2 AG F2 FE | DE FA "B" G2 F2 |
 "Em" E2 B2 B2 AB | "C" G2 E2 E2 FG | "D" A2 AG F2 FE | DEFD "Em" E4 :|
-P: B
 "Em" EF GF EF GF | EF GA B2 E2 | "D" DE FE D2>E2 | F2 A2 "B" G2 F2 |
 "Em" EF GF EF GF | "C" EF GA B2 E2 | "D" DE FE D2 FA | "C" G2 "B" F2 "Em" E4 :|
diff --git a/Session/ThreeAroundThree.abc b/Session/ThreeAroundThree.abc
index 4ecf746..4aecf78 100644
--- a/Session/ThreeAroundThree.abc
+++ b/Session/ThreeAroundThree.abc
@@ -8,5 +8,5 @@ Z:Steve Mansfield 2002
 K:G
 "G" d2BA G2G2 | "D" A2BA "G" G2D2 | "C" EDEF "G" G2AB | "D" c2B2 B2A2 |
 "G" d2BA G2G2 | "D" A2BA "G" G2D2 | "C" EDEF "G" G2Ac | "G" B2 "D" A2 "G" G4 :|
-|: "D" d2 ef "G" gfed | "C" e2e2 e2>e2 | "G" d2B2B2AG | "D" FGAB A4 |
+"D" d2 ef "G" gfed | "C" e2e2 e2>e2 | "G" d2B2B2AG | "D" FGAB A4 |
    "D" d2ef "G" gfed | "C" e2e2e2d2 | "C" ef g2 "D" fgaf | "G" g4 g4 :|
diff --git a/Session/WalsVoorPolle.abc b/Session/WalsVoorPolle.abc
index a34021e..54698f7 100644
--- a/Session/WalsVoorPolle.abc
+++ b/Session/WalsVoorPolle.abc
@@ -7,14 +7,12 @@ L: 1/4
 R: waltz
 Q: 180
 K: Gmaj
-P: A
 % http://www.youtube.com/watch?v=aBxqKx1BTyc
-|: D | "G" B3 | "D" A B d | "D" D3- | D E F | "G" G>F G |\
+D | "G" B3 | "D" A B d | "D" D3- | D E F | "G" G>F G |\
     "C" E F G | "G" B3 | "D" A2 D |
        "G" B3 | "D" A B d | "D" D3- | D E F | "G" G>A B |\
     "D" A G F | "G" G3- | G2 :|
-P: B
-|: A B | "C" c2 B | "D" A2 G | "D" F3- | F B c | d2 c |\
+A B | "C" c2 B | "D" A2 G | "D" F3- | F B c | d2 c |\
     "G" B2 A | G3- | G A B |
          "C" c2 B | "D" A2 G | "D" F2 E | D E F | "G" G>A B |\
      "D" A G F | "G" G3- | G :|
diff --git a/Session/WinsterGallop.abc b/Session/WinsterGallop.abc
index 900ea44..8648dbd 100644
--- a/Session/WinsterGallop.abc
+++ b/Session/WinsterGallop.abc
@@ -8,5 +8,5 @@ R: polka
 K: Gmaj
 "G" GB GB | GB d2 | "D7" A>c BA | "G" GB d2 |
 "C" c e g e | "G" d B d2 | "D7" AB/c/ BA | "G" G2 G2 :|
-|: "G" {c/d/} gf ed | gf ed | gf ed | "D7" cB A2 |
+"G" {c/d/} gf ed | gf ed | gf ed | "D7" cB A2 |
 "D7" fe d2 | fe d2 | d2 A>c | "G" B G G2 :|
diff --git a/dottes.tex b/dottes.tex
index 980731d..1901a60 100644
--- a/dottes.tex
+++ b/dottes.tex
@@ -50,7 +50,6 @@
 % filename, change name, change title, credit.
 \newcommand{\showtune}[8]{%
   \phantomsection
-  \vfill
   \begin{tabularx}{\textwidth}{LCR}
       \addcontentsline{toc}{section}{#2}
       & \hypertarget{#1}{\Large{#2}} & \emph{#4} \\
@@ -65,6 +64,7 @@
         \ifemptyarg{#6}{}{Change: \hyperlink{#6}{#7}.}%
       }\tabularnewline
   \end{tabularx}
+  \vfill
 }
 
 % Show the tune first line. Generate table row.