diff --git a/Alex_Beaupain/Ma_memoire_sale.sg b/Alex_Beaupain/Ma_memoire_sale.sg
index 93261442..64d9a686 100644
--- a/Alex_Beaupain/Ma_memoire_sale.sg
+++ b/Alex_Beaupain/Ma_memoire_sale.sg
@@ -13,7 +13,7 @@
   \beginverse*
     \musicnote{\Intro : \nolyrics{\[C9+ Em C9+ Em]}}
   \endverse
-    
+
   \beginverse
     L\[C9+]ave
     \[Em] Ma mémoire sale dans ce fleuve de \[C9+]boue
diff --git a/Alicia_Keys/If_aint_got_you.sg b/Alicia_Keys/If_aint_got_you.sg
index f74a6d3c..12701ac8 100644
--- a/Alicia_Keys/If_aint_got_you.sg
+++ b/Alicia_Keys/If_aint_got_you.sg
@@ -44,9 +44,9 @@
   \endverse
 
   \beginverse*
-    \musicnote{\Outro : \nolyrics{\[C7 Bm]}}
+    \musicnote{\Outro: \nolyrics{\[C7 Bm]}}
   \endverse
-  
+
   \beginverse
     If I ain't \[Am]got you with me baby \[G7]
     \[G7]So \[Am]nothing in \[Bm]this \[C7]whole wide world don't mean a \[Bm]thing
diff --git a/Dessins_Animes/I_Wanna_be_like_you.sg b/Dessins_Animes/I_Wanna_be_like_you.sg
index db0add02..a42a1e6b 100644
--- a/Dessins_Animes/I_Wanna_be_like_you.sg
+++ b/Dessins_Animes/I_Wanna_be_like_you.sg
@@ -39,8 +39,8 @@
     \[D7]Human \[G]too \[B7]
   \endchorus
 
-  \textnote{parlé}
-
+  \textnote[english]{spoken}
+  \textnote[french]{parlé}
   \beginverse*
     ``Gee, cousin Louie
     You're doin' real good!
diff --git a/Georges_Brassens/Je_me_suis_fait_tout_petit.sg b/Georges_Brassens/Je_me_suis_fait_tout_petit.sg
index 3d717b75..c42d0bd2 100644
--- a/Georges_Brassens/Je_me_suis_fait_tout_petit.sg
+++ b/Georges_Brassens/Je_me_suis_fait_tout_petit.sg
@@ -31,7 +31,7 @@
   \endchorus
 
   \beginverse*
-    \musicnote{\nolyrics{\[Bm Em F\shrp Bm]}}
+    \musicnote{\nolyrics{\[Bm Em F{\shrp} Bm]}}
   \endverse
 
   \beginverse
diff --git a/Gogol_Bordello/Oh_no.sg b/Gogol_Bordello/Oh_no.sg
index fd384bc7..42708989 100644
--- a/Gogol_Bordello/Oh_no.sg
+++ b/Gogol_Bordello/Oh_no.sg
@@ -11,9 +11,9 @@
   \gtab{D}{5:X02220}
 
   \beginverse*
-    \musicnote{\Intro : \nolyrics{\[Em]}}
+    \musicnote{\Intro: \nolyrics{\[Em]}}
   \endverse
-    
+
   \beginverse
     Sometimes when facing common \[B]trouble
     When whole town is \[Em]screwed
diff --git a/Jacques_Higelin/Tombe_du_ciel.sg b/Jacques_Higelin/Tombe_du_ciel.sg
index 302935d5..0552fa89 100644
--- a/Jacques_Higelin/Tombe_du_ciel.sg
+++ b/Jacques_Higelin/Tombe_du_ciel.sg
@@ -73,14 +73,14 @@
 
   \musicnote[english]{transpose by a third}
   \musicnote[french]{transposer d'une tierce}
-  
+
   \beginchorus
     Tomber d'en haut, comme les petites gouttes d'eau
     Que j'entends tomber
     Dehors, par la f'nêtre
     Quand je m'endors le cœur en fête
   \endchorus
-  
+
   \beginchorus
     Poseur de girouettes
     Du haut du clocher
diff --git a/Le_Donjon_de_Naheulbeuk/Les_epees_Durandil.sg b/Le_Donjon_de_Naheulbeuk/Les_epees_Durandil.sg
index 3fc2645e..967e2892 100644
--- a/Le_Donjon_de_Naheulbeuk/Les_epees_Durandil.sg
+++ b/Le_Donjon_de_Naheulbeuk/Les_epees_Durandil.sg
@@ -11,7 +11,7 @@
 
 
   \textnote[english]{spoken}
-  \textnote[english]{parlé}
+  \textnote[french]{parlé}
   \beginverse*
     {\og}Et dis donc, tu voudrais bien m'prêter ton épée, j'ai perdu ma hache ?
     --- J'voudrais bien mais elle est beaucoup trop précieuse regarde !
diff --git a/Les_Cowboys_Fringants/Plus_rien.sg b/Les_Cowboys_Fringants/Plus_rien.sg
index 001bd33c..d011078c 100644
--- a/Les_Cowboys_Fringants/Plus_rien.sg
+++ b/Les_Cowboys_Fringants/Plus_rien.sg
@@ -10,7 +10,7 @@
   \gtab{Gm}{3:022000}
   \gtab{B&}{1:X02220}
   \gtab{A7}{X02020}
- 
+
   \beginverse*
     \musicnote{\Pattern 1 : \nolyrics{\[Dm F C G]}}
   \endverse
@@ -25,7 +25,7 @@
   \beginverse*
     \musicnote{\Pattern 2 : \nolyrics{\[Dm G C B\flt]}}
   \endverse
-  
+
   \beginverse*
     On \[Dm]{m'a} décrit jadis, quand j'étais un enfant
     Ce \[Gm]{qu'avait} l'air le monde il y a très très longtemps
diff --git a/Oldelaf_et_Monsieur_D/Trahis.sg b/Oldelaf_et_Monsieur_D/Trahis.sg
index a17f16be..e21f31a7 100644
--- a/Oldelaf_et_Monsieur_D/Trahis.sg
+++ b/Oldelaf_et_Monsieur_D/Trahis.sg
@@ -11,7 +11,7 @@
   \gtab{C#}{4:X02220}
 
   \beginverse*
-    \musicnote{\Intro : \nolyrics{\[F#m D A E]} \rep{2}}
+    \musicnote{\Intro : \nolyrics{\[F{\shrp}m D A E]} \rep{2}}
   \endverse
 
   \beginverse
diff --git a/Renaud/La_blanche.sg b/Renaud/La_blanche.sg
index b5475a2e..472cd735 100644
--- a/Renaud/La_blanche.sg
+++ b/Renaud/La_blanche.sg
@@ -13,7 +13,7 @@
 
   \ifchorded
   \beginchorus
-    {\nolyrics \[Em C Em A F\shrp]}
+    {\nolyrics \[Em C Em A F{\shrp}]}
   \endchorus
   \fi
 
diff --git a/Sheepbox/Not_scared_to_die.sg b/Sheepbox/Not_scared_to_die.sg
index df2c1f2d..2f5c8eac 100644
--- a/Sheepbox/Not_scared_to_die.sg
+++ b/Sheepbox/Not_scared_to_die.sg
@@ -16,7 +16,7 @@
   \gtab{E7}{020100}
 
   \beginverse*
-    \musicnote{\Intro : \nolyrics{\[C{\shrp}m Em Bm A]} \rep{2}}
+    \musicnote{\Intro: \nolyrics{\[C{\shrp}m Em Bm A]} \rep{2}}
   \endverse
 
   \beginverse
diff --git a/Simon_Garfunkel/Me_and_Julio_down_by_the_schoolyard.sg b/Simon_Garfunkel/Me_and_Julio_down_by_the_schoolyard.sg
index 313aa311..1a4e7786 100644
--- a/Simon_Garfunkel/Me_and_Julio_down_by_the_schoolyard.sg
+++ b/Simon_Garfunkel/Me_and_Julio_down_by_the_schoolyard.sg
@@ -13,7 +13,7 @@
   \beginverse*
     \musicnote{\Intro : \nolyrics{\[G C G D]} \rep{2}}
   \endverse
-  
+
   \beginverse
     The \[G]mama pajama rolled out of bed
     And ran to the police \[C]station
diff --git a/The_Beatles/Twist_and_shout.sg b/The_Beatles/Twist_and_shout.sg
index 839f613c..483363cc 100644
--- a/The_Beatles/Twist_and_shout.sg
+++ b/The_Beatles/Twist_and_shout.sg
@@ -36,9 +36,8 @@
     \[A]Ah \echo{Ah Ah} Ah \echo{Ah Ah}
   \endverse
 
-  \musicnote[english]{\Chorus, repeat \Verse 2}
-  \musicnote[french]{\Chorus, répéter le \Verse 2}
-
+  \musicnote{\Chorus; \Verse 2}
+  
   \beginverse*
     \[A7]Well, shake it, shake it, shake it, \[D]baby, now \echo{\[G]shake it up \[A]baby} \rep{3}
     \[A]Ah \echo{Ah Ah} Ah!
diff --git a/The_Calling/Wherever_you_will_go.sg b/The_Calling/Wherever_you_will_go.sg
index cc063c56..02f4eb6b 100644
--- a/The_Calling/Wherever_you_will_go.sg
+++ b/The_Calling/Wherever_you_will_go.sg
@@ -50,7 +50,7 @@
   \end{tab}
 
   \beginverse*
-    \musicnote{\Intro : \nolyrics{\[C C/B Am7 F]}}
+    \musicnote{\Intro: \nolyrics{\[C C/B Am7 F]}}
   \endverse
 
   \beginverse
diff --git a/The_Fray/How_to_save_a_life.sg b/The_Fray/How_to_save_a_life.sg
index 4ad3b426..9f0538ab 100644
--- a/The_Fray/How_to_save_a_life.sg
+++ b/The_Fray/How_to_save_a_life.sg
@@ -12,7 +12,7 @@
   \gtab{C}{X32010}
 
   \beginverse*
-    \musicnote{\Intro : \nolyrics{\[G D4 Em D D4 G]}}
+    \musicnote{\Intro: \nolyrics{\[G D4 Em D D4 G]}}
   \endverse
 
   \beginverse
diff --git a/The_Innocence_Mission/The_lakes_of_Canada.sg b/The_Innocence_Mission/The_lakes_of_Canada.sg
index b316f8ca..dd0cb9eb 100644
--- a/The_Innocence_Mission/The_lakes_of_Canada.sg
+++ b/The_Innocence_Mission/The_lakes_of_Canada.sg
@@ -12,7 +12,7 @@
   \gtab{Am}{X02210}
 
   \beginverse*
-    \musicnote{\Intro : \nolyrics{\[Dm F C G]} \rep{2}}
+    \musicnote{\Intro: \nolyrics{\[Dm F C G]} \rep{2}}
   \endverse
 
   \beginverse
diff --git a/Yodelice/Sunday_with_a_flu.sg b/Yodelice/Sunday_with_a_flu.sg
index 237717de..a6f06585 100644
--- a/Yodelice/Sunday_with_a_flu.sg
+++ b/Yodelice/Sunday_with_a_flu.sg
@@ -10,7 +10,7 @@
   \gtab{D}{XX0232}
 
   \beginverse*
-    \musicnote{\Intro : \nolyrics{\[Bm G D Bm]}}
+    \musicnote{\Intro: \nolyrics{\[Bm G D Bm]}}
   \endverse
 
   \beginverse
@@ -40,8 +40,8 @@
     And I just can't get over you
   \endverse
 
-  \musicnote[english]{\Chorus, whistled verse, and \Chorus}
-  \musicnote[french]{\Chorus, couplet sifflé et \Chorus}
+  \musicnote[english]{\Chorus; whistled verse; \Chorus}
+  \musicnote[french]{\Chorus ; couplet sifflé ; \Chorus}
 
   \beginverse
     Called a cabbage, threw the garbage