diff --git a/songs/HK_Saltimbanks/Citoyen_du_monde.sg b/songs/HK_Saltimbanks/Citoyen_du_monde.sg
index 55b5dab4..f99e2594 100644
--- a/songs/HK_Saltimbanks/Citoyen_du_monde.sg
+++ b/songs/HK_Saltimbanks/Citoyen_du_monde.sg
@@ -91,4 +91,4 @@
     \end{verse*}
   \end{repeatedchords}
 
-\endsong
\ No newline at end of file
+\endsong
diff --git a/songs/HK_Saltimbanks/On_lache_rien.sg b/songs/HK_Saltimbanks/On_lache_rien.sg
index c4739ae2..ada15429 100644
--- a/songs/HK_Saltimbanks/On_lache_rien.sg
+++ b/songs/HK_Saltimbanks/On_lache_rien.sg
@@ -121,4 +121,4 @@
     \textnote{\Chorus}
   \end{repeatedchords}
 
-\endsong
\ No newline at end of file
+\endsong
diff --git a/songs/HK_Saltimbanks/Passer_ma_vie.sg b/songs/HK_Saltimbanks/Passer_ma_vie.sg
index 1815718a..77303b81 100644
--- a/songs/HK_Saltimbanks/Passer_ma_vie.sg
+++ b/songs/HK_Saltimbanks/Passer_ma_vie.sg
@@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{1}
 \beginsong{Passer ma vie}
-  [by=HK & Les Saltimbanks,cov=citoyen-du-monde,album=Citoyen du monde]
+  [by=HK \& Les Saltimbanks,cov=citoyen-du-monde,album=Citoyen du monde]
 
   \cover
   \gtab{C}{X32010}
diff --git a/songs/Nirvana/Dumb.sg b/songs/Nirvana/Dumb.sg
index 0b596e73..209c3dd6 100644
--- a/songs/Nirvana/Dumb.sg
+++ b/songs/Nirvana/Dumb.sg
@@ -70,7 +70,7 @@
   \end{verse*}
 
   \begin{verse*}
-    \musicnote{\Verse{} \& \Chorus 1}
+    \musicnote{\Verse \& \Chorus 1}
   \end{verse*}
 
   \begin{verse}
diff --git a/songs/Noir_Desir/Charlie.sg b/songs/Noir_Desir/Charlie.sg
index 09abf2a2..7e433b23 100644
--- a/songs/Noir_Desir/Charlie.sg
+++ b/songs/Noir_Desir/Charlie.sg
@@ -4,7 +4,7 @@
   [by=Noir Désir,cov=du-ciment-sous-les-plaines,album=Du ciment sous les plaines]
 
   \cover
-  \gtab{F#m}{1:022000}
+  \gtab{F#m}{2:022000}
   \gtab{E}{022100}
 
   \begin{verse}
@@ -46,7 +46,7 @@
   \begin{repeatedchords}
     \begin{chorus}
       Mainte\[F#m]nant dans l'eau sale, elle traîne \[E]sa bouche pâle
-      Au fond du cani\[F#m]vau \[E]
+      Au fond du cani\[F#m]veau \[E]
       Où elle cou\[F#m]le ? \[E] \rep{2}
       Où elle cou\[F#m]le, la rivière \[E]de sang chaud
     \end{chorus}
diff --git a/songs/Noir_Desir/L_homme_presse.sg b/songs/Noir_Desir/L_homme_presse.sg
index a7d5cd98..49af8d9c 100644
--- a/songs/Noir_Desir/L_homme_presse.sg
+++ b/songs/Noir_Desir/L_homme_presse.sg
@@ -4,8 +4,8 @@
   [by=Noir Désir,cov=666-667-club,album=666.667 Club~]
 
   \cover
-  \gtab{Am}{X022XX}
-  \gtab{D}{X002XX}
+  \gtab*{Am}{X022XX}
+  \gtab*{D}{X002XX}
   \gtab{G}{320003}
   \gtab{F}{1:022100}
   \gtab{C}{X32010}
diff --git a/songs/Noir_Desir/Lazy.sg b/songs/Noir_Desir/Lazy.sg
index 517b565a..4f165938 100644
--- a/songs/Noir_Desir/Lazy.sg
+++ b/songs/Noir_Desir/Lazy.sg
@@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Lazy}
-  [by=Noir Désir,cov=666-667-club,album=666.667 Clu&]
+  [by=Noir Désir,cov=666-667-club,album=666.667 Club~]
 
   \cover
   \gtab{Am}{X02210}
@@ -34,9 +34,7 @@
       I can deal with what's in your mind \[D]
       Anyway, I'm tired and I feel lazy \[Am]
     \end{verse}
-  \end{repeatedchords}
 
-  \begin{repeatedchords}
     \begin{verse}
       \[Am]{You know}, we're both lost in maze
       You're miserable, I'm so dazed \[D]
@@ -46,4 +44,4 @@
 
   \musicnote{\Chorus}
 
-\endsong
\ No newline at end of file
+\endsong
diff --git a/songs/Noir_Desir/Toujours_etre_ailleurs.sg b/songs/Noir_Desir/Toujours_etre_ailleurs.sg
index 25457be3..391dbc45 100644
--- a/songs/Noir_Desir/Toujours_etre_ailleurs.sg
+++ b/songs/Noir_Desir/Toujours_etre_ailleurs.sg
@@ -13,7 +13,7 @@
   \end{verse*}
 
   \begin{verse}
-    \[Dm] Oh chaque \[F]nuit se ré\[G]duire en \[Dm]cendre
+    \[Dm] Oh chaque \[F]nuit se ré\[G]duire en \[Dm]cendres
     Se laisser répandre
     Dans les la\[F]vabos \[G]blancs \[Dm]
     La solu\[F]tion est sans \[G]doute a\[Dm]mère
@@ -29,14 +29,13 @@
     Et les \[F]yeux \[G]vers l'ou\[Dm]est
     Toujours \[F]être \[G]aille\[Dm]urs
     Et les \[F]mains \[G]vers l'\[Dm]est
-
     J'veux toujours \[F]être \[G]aille\[Dm]urs !
   \end{chorus}
 
   \begin{repeatedchords}
     \begin{verse}
       \[Dm] J'ai la naus\[F]ée quand je \[G]reste ass\[Dm]is
-      Si je suis couché je n'joint pas \[F]les deb\[G]outs \[Dm]
+      Si je suis couché je n'joins pas \[F]les deb\[G]outs \[Dm]
       Et je sour\[F]is pour le \[G]photogra\[Dm]phe
       Qui va nous figer
       Notez mon \[F]épit\[G]aphe \[Dm]
@@ -48,7 +47,7 @@
     \begin{verse}
       Oh j'ai jam\[F]ais pu \[G]oublier \[Dm]
       L'odeur des \[F]endroits \[G]où j'ir\[Dm]ai
-      C'est seulement \[F]une quest\[G]ion de \[Dm]moeurs
+      C'est seulement \[F]une quest\[G]ion de \[Dm]mœurs
       J'veux toujours \[F]être \[G]aille\[Dm]urs !
       J'veux toujours \[F]être \[G]aille\[Dm]urs !
     \end{verse}
diff --git a/songs/Oasis/Im_outta_time.sg b/songs/Oasis/Im_outta_time.sg
index d9b32d19..37947e9d 100644
--- a/songs/Oasis/Im_outta_time.sg
+++ b/songs/Oasis/Im_outta_time.sg
@@ -5,7 +5,7 @@
 
   \cover
   \gtab{Em}{022000}
-  \gtab{Esus4}{022200}
+  \gtab*{Esus4}{022200}
   \gtab{Am}{X02210}
   \gtab{C}{X32010}
   \gtab{G}{320003}
diff --git a/songs/Oasis/Wonderwall.sg b/songs/Oasis/Wonderwall.sg
index a8d14ecc..5f77d53f 100644
--- a/songs/Oasis/Wonderwall.sg
+++ b/songs/Oasis/Wonderwall.sg
@@ -5,12 +5,12 @@
 
   \cover
   \capo{2}
-  \gtab{Em7}{022033}
-  \gtab{G}{320033}
-  \gtab{Dsus4}{XX0233}
-  \gtab{A7sus4}{X02033}
-  \gtab{C}{X32033}
-  \gtab{G/F#}{2X0033}
+  \gtab*{Em7}{022033}
+  \gtab*{G}{320033}
+  \gtab*{Dsus4}{XX0233}
+  \gtab*{A7sus4}{X02033}
+  \gtab*{C}{X32033}
+  \gtab*{G/F#}{2X0033}
 
   \begin{verse}
     \[Em7]Today is \[G]gonna be the day that they're \[Dsus4]{gonna throw} it back to \[A7sus4]you
diff --git a/songs/Oldelaf_et_Monsieur_D/Courseulles_sur_Mer.sg b/songs/Oldelaf_et_Monsieur_D/Courseulles_sur_Mer.sg
index 13bdd253..3e754b7b 100644
--- a/songs/Oldelaf_et_Monsieur_D/Courseulles_sur_Mer.sg
+++ b/songs/Oldelaf_et_Monsieur_D/Courseulles_sur_Mer.sg
@@ -27,7 +27,7 @@
   \end{verse*}
 
   \begin{chorus}
-    \[F]Et sur cette plage de Courseulles-sur\[C]Mer
+    \[F]Et sur cette plage de Courseulles-sur-\[C]Mer
     \[Dm]J'avoue que je ne me rappelle \[Am]pas
     \[F]Pourquoi tu paraissais un brin a\[C]mère
     \[F]Alors que j'étais \[E]si bien avec \[Am]toi
diff --git a/songs/Oldelaf_et_Monsieur_D/Nathalie.sg b/songs/Oldelaf_et_Monsieur_D/Nathalie.sg
index 877eccfa..a2571153 100644
--- a/songs/Oldelaf_et_Monsieur_D/Nathalie.sg
+++ b/songs/Oldelaf_et_Monsieur_D/Nathalie.sg
@@ -34,7 +34,9 @@
 
 
   \begin{verse*}
-    \echo{Vous pouvez chanter avec nous car cette chanson est à la page 137 dans vos diapasons rouges}
+    \textnote[french]{parlé}
+    \textnote[english]{spoken}
+    Vous pouvez chanter avec nous car cette chanson est à la page 137 dans vos diapasons rouges
   \end{verse*}
 
   \begin{verse}
diff --git a/songs/Paco_Ibanez/A_galopar.sg b/songs/Paco_Ibanez/A_galopar.sg
index 2221b52a..a740b49d 100644
--- a/songs/Paco_Ibanez/A_galopar.sg
+++ b/songs/Paco_Ibanez/A_galopar.sg
@@ -1,7 +1,7 @@
 \selectlanguage{spanish}
 \songcolumns{2}
 \beginsong{A galopar}
-  [by=Paco Ib\'a\~nez,cov=a-galopar,album=A galopar]
+  [by=Paco Ibáñez,cov=a-galopar,album=A galopar]
 
   \cover
   \gtab{Am}{X02210}
@@ -37,4 +37,3 @@
   \end{verse}
 
 \endsong
-
diff --git a/songs/Patrick_Coutin/J_aime_regarder_les_filles.sg b/songs/Patrick_Coutin/J_aime_regarder_les_filles.sg
index 5f2fa4a8..1b90f191 100644
--- a/songs/Patrick_Coutin/J_aime_regarder_les_filles.sg
+++ b/songs/Patrick_Coutin/J_aime_regarder_les_filles.sg
@@ -2,6 +2,7 @@
 \songcolumns{1}
 \beginsong{J'aime regarder les filles}
   [by=Patrick Coutin,cov=1981,album=1981]
+
   \cover
   \gtab{D}{5:X02220}
   \gtab{C}{3:X02220}
@@ -42,7 +43,7 @@
     \begin{verse}
       \[D]J'aime \[C]
       \[D]J'aime regar\[C]der les \[D]filles qui marchent \[C]sur la \[D]plage
-      Quand elles \[C]se déhab\[D]illent et font sembl\[C]ant d'êt\[D]re sages
+      Quand elles \[C]se déshab\[D]illent et font sembl\[C]ant d'êt\[D]re sages
       Leurs yeux q\[C]ui se de\[D]mandent mais quel es\[C]t ce garç\[D]on
     \end{verse}
 
@@ -55,4 +56,4 @@
     \end{verse}
   \end{repeatedchords}
 
-\endsong
\ No newline at end of file
+\endsong
diff --git a/songs/Pep_s/Liberta.sg b/songs/Pep_s/Liberta.sg
index 858fb886..da4c272d 100644
--- a/songs/Pep_s/Liberta.sg
+++ b/songs/Pep_s/Liberta.sg
@@ -5,15 +5,16 @@
 
   \cover
   \capo{6}
-  \gtab {Em}{022000}
-  \gtab {C}{X32010}
-  \gtab {G}{32001}
-  \gtab {D/F#}{200232}
+
+  \gtab{Em}{022000}
+  \gtab{C}{X32010}
+  \gtab{G}{320003}
+  \gtab*{D/F#}{200232}
 
   \begin{verse}
-    \[Em]Tu sais qu'il y a un bateaux qui mène au \[C]pays des rêves
+    \[Em]Tu sais qu'il y a un bateau qui mène au \[C]pays des rêves
     \[G]Là-bas où il fait chaud, où le ciel n'a \[D/F#]pas son pareil
-    Tu sais qu'au bout cette terre, oui les gens sèment
+    Tu sais qu'au bout de cette terre, oui les gens sèment
     Des milliers de graines de joie comme pousse ici la haine
     On m'avait dit, p'tit gars, là-bas on t'enlève tes chaînes
     On te donne une vie sans t'jeter dans l'arène
diff --git a/songs/Pierre_Perret/Bernard_Pivot.sg b/songs/Pierre_Perret/Bernard_Pivot.sg
index f5f5a570..fbf2909c 100644
--- a/songs/Pierre_Perret/Bernard_Pivot.sg
+++ b/songs/Pierre_Perret/Bernard_Pivot.sg
@@ -49,7 +49,7 @@
     Quelques sardines un yaourt ou des œufs
     Devant la télé
     Où la nourriture audiovisuelle
-    Sera dabord spirituelle
+    Sera d'abord spirituelle
     Car un seul homme à ce moment prévaut
     C'est Bernard Pivot
   \end{verse}
diff --git a/songs/Pierre_Perret/Mon_ptit_loup.sg b/songs/Pierre_Perret/Mon_ptit_loup.sg
index ab8bc43f..1cb1d35d 100644
--- a/songs/Pierre_Perret/Mon_ptit_loup.sg
+++ b/songs/Pierre_Perret/Mon_ptit_loup.sg
@@ -3,7 +3,6 @@
 \beginsong{Mon p'tit loup}
   [by=Pierre Perret,cov=pierrot-l-amour,album=L'amour]
 
-
   \cover
   \gtab{Am}{X02210}
   \gtab{Dm}{XX0231}
@@ -22,7 +21,7 @@
     Respirer la violette à Parme
     Et les é\[Dm]pices à \[G]Colom\[C]bo
     \[Am]On verra le fleuve Amaz\[Am]one
-    Et la vall\[Dm]ée des Orchi\[Am]dés
+    Et la vall\[Dm]ée des Orchi\[Am]dées
     Et les enfants qui ne savonnent
     Le ventre \[Dm]avec des fleurs coup\[Am]ées
   \end{verse}
diff --git a/songs/Red_Hot_Chili_Peppers/Dani_California.sg b/songs/Red_Hot_Chili_Peppers/Dani_California.sg
index 421c7b68..cc3736d7 100644
--- a/songs/Red_Hot_Chili_Peppers/Dani_California.sg
+++ b/songs/Red_Hot_Chili_Peppers/Dani_California.sg
@@ -42,7 +42,7 @@
     She's a lover, Baby and a fighter
     Should've seen it coming when I got a little brighter
     With a name like ``Dani California''
-    Day was gona come when I was gona mourn ya
+    Day was gonna come when I was gonna mourn ya
     A little low that she was stealing another bread
     I love my baby to death
   \end{verse}
diff --git a/songs/Red_Hot_Chili_Peppers/Under_the_bridge.sg b/songs/Red_Hot_Chili_Peppers/Under_the_bridge.sg
index 55ec0b16..b6080ca2 100644
--- a/songs/Red_Hot_Chili_Peppers/Under_the_bridge.sg
+++ b/songs/Red_Hot_Chili_Peppers/Under_the_bridge.sg
@@ -7,13 +7,13 @@
   \gtab{E}{022100}
   \gtab{B}{2:X02220}
   \gtab{C#m}{4:X02210}
-  \gtab{G#m}{4:02200}
+  \gtab{G#m}{4:022000}
   \gtab{A}{5:022100}
-  \gtab{EM7}{021100}
+  \gtab*{EM7}{021100}
   \gtab{F#m}{2:022000}
   \gtab{Am7}{X02010}
-  \gtab{G6}{7:X02010}
-  \gtab{FM7}{1:X2110X}
+  \gtab*{G6}{7:X02010}
+  \gtab*{FM7}{1:X2110X}
   \gtab{C}{X32010}
 
   \begin{verse}
diff --git a/songs/Renaud/Amoureux_de_paname.sg b/songs/Renaud/Amoureux_de_paname.sg
index 084d433f..ddd6a645 100644
--- a/songs/Renaud/Amoureux_de_paname.sg
+++ b/songs/Renaud/Amoureux_de_paname.sg
@@ -5,7 +5,7 @@
 
   \cover
   \capo{2}
-  \gtab{G}{022000}
+  \gtab{G}{320003}
   \gtab{Am}{X02210}
   \gtab{D}{XX0232}
   \gtab{Em}{022000}
@@ -63,5 +63,4 @@
     Le gaz carbonique, c'est mon hygiène
   \end{verse*}
 
-
 \endsong
diff --git a/songs/Renaud/Docteur_Renaud_Mister_Renard.sg b/songs/Renaud/Docteur_Renaud_Mister_Renard.sg
index a575226e..126f9b87 100644
--- a/songs/Renaud/Docteur_Renaud_Mister_Renard.sg
+++ b/songs/Renaud/Docteur_Renaud_Mister_Renard.sg
@@ -7,10 +7,10 @@
   \gtab{Am}{X02210}
   \gtab{F}{1:022100}
   \gtab{G}{320003}
-  \gtab{Em7}{022030}
-  \gtab{F2}{1330XX}
-  \gtab{G2}{3X02XX}
-  \gtab{E/G#}{2:311341}
+  \gtab*{Em7}{022030}
+  \gtab*{F2}{1330XX}
+  \gtab*{G2}{3X02XX}
+  \gtab*{E/G#}{2:311341}
 
   \begin{verse}
     \[Am]Comme y'a eu \[F]Gainsbourg et Gains\[G]barre
@@ -93,5 +93,4 @@
     Mais aimera toujours Renaud\[Am] \[F]
   \end{verse}
 
-
 \endsong
diff --git a/songs/Renaud/It_is_not_because_you_are.sg b/songs/Renaud/It_is_not_because_you_are.sg
index 9f20699b..60e29a3f 100644
--- a/songs/Renaud/It_is_not_because_you_are.sg
+++ b/songs/Renaud/It_is_not_because_you_are.sg
@@ -1,14 +1,14 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{It is not because you are}
-  [by=Renaud,album=Marche à l'ombre,cov=marche-a-l-ombre]
+  [by=Renaud,cov=marche-a-l-ombre,album=Marche à l'ombre]
 
   \cover
   \gtab{F}{1:022100}
   \gtab{Dm}{XX0231}
   \gtab{Gm}{3:022000}
   \gtab{C}{X32010}
-  \gtab{E5+}{022222}
+  \gtab*{E5+}{022222}
 
   \begin{verse}
     When I \[F]have rencontred \[Dm]you
@@ -81,4 +81,4 @@
     \dots Qu'I am \[F]you
   \end{chorus}
 
-\endsong
\ No newline at end of file
+\endsong
diff --git a/songs/Renaud/La_ballade_nord_irlandaise.sg b/songs/Renaud/La_ballade_nord_irlandaise.sg
index ae5339ce..1302d4a4 100644
--- a/songs/Renaud/La_ballade_nord_irlandaise.sg
+++ b/songs/Renaud/La_ballade_nord_irlandaise.sg
@@ -6,7 +6,7 @@
   \cover
   \gtab{C}{X32010}
   \gtab{F}{1:022100}
-  \gtab{C/B}{X22010}
+  \gtab*{C/B}{X22010}
   \gtab{Am}{X02210}
   \gtab{G}{320003}
 
@@ -45,4 +45,4 @@
     Les fruits sucrés de la liberté
   \end{verse}
 
-\endsong
\ No newline at end of file
+\endsong
diff --git a/songs/Renaud/Ma_gonzesse.sg b/songs/Renaud/Ma_gonzesse.sg
index 0478ad74..0df92c29 100644
--- a/songs/Renaud/Ma_gonzesse.sg
+++ b/songs/Renaud/Ma_gonzesse.sg
@@ -1,7 +1,7 @@
-\selectlanguage{english}
+\selectlanguage{french}
 \songcolumns{2}
 \beginsong{Ma gonzesse}
-  [by=Renaud,album=Ma gonzesse,cov=ma-gonzesse]
+  [by=Renaud,cov=ma-gonzesse,album=Ma gonzesse]
 
   \cover
   \gtab{C}{X32010}
@@ -10,7 +10,7 @@
   \gtab{Am}{X02210}
   \gtab{D}{XX0232}
   \gtab{G}{320003}
-  \gtab{B&}{X13331}
+  \gtab{B&}{1:X02220}
 
   \begin{verse}
     \[C]Malgré le blouson clouté
@@ -47,7 +47,7 @@
       \[C]Tu sais bien les statues
       Du \[Dm]jardin des Tuileries
       \[Fm]Qui hiver comme été
-      Ex\[C]hibent leurs gui\[Am]boles
+      Ex\[C]hibent leurs gui\[Am]bolles
       \[D]Et se gèlent le cul
       \[G]Et le reste aussi
     \end{verse*}
@@ -95,4 +95,4 @@
 
   \end{repeatedchords}
 
-\endsong
\ No newline at end of file
+\endsong
diff --git a/songs/Renaud/Manatthan-Kaboul.sg b/songs/Renaud/Manatthan-Kaboul.sg
index 7f8ee38b..5f2eb509 100644
--- a/songs/Renaud/Manatthan-Kaboul.sg
+++ b/songs/Renaud/Manatthan-Kaboul.sg
@@ -9,12 +9,12 @@
   \gtab{G}{320003}
   \gtab{E}{022100}
   \gtab{Am}{X02210}
-  \gtab{Dm7}{XX0211}
+  \gtab*{Dm7}{XX0211}
   \gtab{Em}{022000}
   \gtab*{E*}{2:XX134X}
-  \gtab{E/D}{2:XX034X}
-  \gtab{E/C}{2:X2X34X}
-  \gtab{E/B}{2:X1X34X}
+  \gtab*{E/D}{2:XX034X}
+  \gtab*{E/C}{2:X2X34X}
+  \gtab*{E/B}{2:X1X34X}
 
   %intro à faire
 
diff --git a/songs/Renaud/Marche_a_l_ombre.sg b/songs/Renaud/Marche_a_l_ombre.sg
index bb6e5227..7f3e62e7 100644
--- a/songs/Renaud/Marche_a_l_ombre.sg
+++ b/songs/Renaud/Marche_a_l_ombre.sg
@@ -83,7 +83,7 @@
   \end{verse}
 
   \begin{verse*}
-    Derrière ses pauvres Rayban
+    Derrière ses pauvres Ray-Ban
     J'vois pas ses yeux et ça m'énerve
     Si ça s'trouve il m'regarde
     Faut qu'il arrête sinon je l'crève
diff --git a/songs/Renaud/Mort_les_enfants.sg b/songs/Renaud/Mort_les_enfants.sg
index a797e714..d59623c5 100644
--- a/songs/Renaud/Mort_les_enfants.sg
+++ b/songs/Renaud/Mort_les_enfants.sg
@@ -1,13 +1,13 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Morts les enfants}
-  [by=Renaud,album=Mistral Gagnant,cov=mistral-gagnant]
+  [by=Renaud,cov=mistral-gagnant,album=Mistral Gagnant]
 
   \cover
   \gtab{Dm}{XX0231}
   \gtab{E7}{020100}
   \gtab{A7}{X02020}
-  \gtab{B&}{X13331}
+  \gtab{B&}{1:X02220}
   \gtab{Gm}{3:022000}
   \gtab{F}{1:022100}
   \gtab{C}{X32010}
@@ -91,4 +91,4 @@
     \end{chorus}
   \end{repeatedchords}
 
-\endsong
\ No newline at end of file
+\endsong
diff --git a/songs/Ritchie_Valens/La_bamba.sg b/songs/Ritchie_Valens/La_bamba.sg
index 1f0e83f8..c8a0d843 100644
--- a/songs/Ritchie_Valens/La_bamba.sg
+++ b/songs/Ritchie_Valens/La_bamba.sg
@@ -3,27 +3,25 @@
 \beginsong{La Bamba}
   [by=Ritchie Valens,cov=la-bamba,album=La bamba]
 
-
   \cover
   \gtab{C}{X32010}
   \gtab{F}{1:022100}
   \gtab{G}{320003}
 
-
   \begin{verse}
     Para bailar la \[C]Bamba\[F G]
     Para bailar la \[C]Bamba
-    Se nece\[F]ssi\[G]ta una poca de \[C]gracia\[F G]
+    Se nece\[F]si\[G]ta una poca de \[C]gracia\[F G]
     Una poca de \[C]gracia
     Para \[F]mi, para \[G]ti, ay arriba, ay arri\[C]ba\[F G]
     Ay, arriba arri\[C]ba
-    Por \[F]ti se\[G]re, por ti se\[C]re, por \[F]ti se\[G]re
+    Por \[F]ti se\[G]ré, por ti se\[C]ré, por \[F]ti se\[G]ré
   \end{verse}
 
   \begin{verse}
     Yo no soy marinero
-    Yo no soy marinero, soy capitan
-    Soy capitan, soy capitan
+    Yo no soy marinero, soy capitán
+    Soy capitán, soy capitán
     Baila, bamba
     Baila, bamba
     Baila, bamba
@@ -32,7 +30,7 @@
   \begin{verse}
     Para bailar la Bamba
     Para bailar la Bamba
-    Se necessita una poca de gracia
+    Se necesita una poca de gracia
     Una poca de gracia
     Para mi, para ti, ay arriba, ay arriba
   \end{verse}
diff --git a/songs/Roch_Voisine/Helene.sg b/songs/Roch_Voisine/Helene.sg
index b6986f0a..9fc0338d 100644
--- a/songs/Roch_Voisine/Helene.sg
+++ b/songs/Roch_Voisine/Helene.sg
@@ -5,7 +5,7 @@
 
   \cover
   \gtab{Em}{022000}
-  \gtab{G}{320002}
+  \gtab{G}{320003}
   \gtab{C}{X32010}
   \gtab{D}{XX0232}
   \gtab{Am}{X02210}
@@ -70,4 +70,5 @@
   \begin{verse*}
     Dans \[D]ton pays loin de \[Em]moi
   \end{verse*}
-\endsong
\ No newline at end of file
+
+\endsong
diff --git a/songs/Rose/La_liste_de_Rose.sg b/songs/Rose/La_liste_de_Rose.sg
index fdc622a2..93f947c1 100644
--- a/songs/Rose/La_liste_de_Rose.sg
+++ b/songs/Rose/La_liste_de_Rose.sg
@@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{La liste de Rose}
-  [by=Rose,cov=Rose,album=Rose]
+  [by=Rose,cov=rose,album=Rose]
 
   \cover
   \capo{3}
@@ -11,7 +11,7 @@
   \gtab{D7}{X00212}
   \gtab{Em}{022000}
   \gtab{G}{320003}
-  \gtab{G4}{320503}
+  \gtab*{G4}{320503}
   \gtab{Am7}{002010}
   \gtab{A7}{X02020}
   \gtab{Bm7}{2:002010}
@@ -98,9 +98,3 @@
   \end{verse}
 
 \endsong
-
-
-
-
-
-
diff --git a/songs/Sheepbox/Devil_s_way.sg b/songs/Sheepbox/Devil_s_way.sg
index f8340348..9f46460b 100644
--- a/songs/Sheepbox/Devil_s_way.sg
+++ b/songs/Sheepbox/Devil_s_way.sg
@@ -3,6 +3,8 @@
 \beginsong{Devil's Way}
   [by=Sheepbox,cov=sheepbox,album=Sheepbox]
 
+  \cover
+
   % verse: 1.&.2.&.3.&.4.&
   % D D UD
   % Em Asus2
@@ -13,7 +15,7 @@
   \cover
   \capo{9}
   \gtab{Em}{022000}
-  \gtab{Asus2}{X02200}
+  \gtab*{Asus2}{X02200}
   \gtab{Am}{X02210}
   \gtab{Dm}{XX0231}
   \gtab{C}{X32010}
@@ -120,5 +122,3 @@
   \musicnote{\Chorus}
 
 \endsong
-
-
diff --git a/songs/Simon_Garfunkel/Feeling_groovy.sg b/songs/Simon_Garfunkel/Feeling_groovy.sg
index 7054cfa8..3496f815 100644
--- a/songs/Simon_Garfunkel/Feeling_groovy.sg
+++ b/songs/Simon_Garfunkel/Feeling_groovy.sg
@@ -20,7 +20,7 @@
   \end{chorus}
 
   \begin{verse}
-    Hello lamp post, what cha knowin'
+    Hello lamp post, whatcha knowin'
     I've come to watch your flowers growin'
     Aint'cha got no rhymes for me?
     Doot-in doo-doo, feelin'groovy
diff --git a/songs/Simon_Garfunkel/Kathy_s_song.sg b/songs/Simon_Garfunkel/Kathy_s_song.sg
index 6c874692..586bac24 100644
--- a/songs/Simon_Garfunkel/Kathy_s_song.sg
+++ b/songs/Simon_Garfunkel/Kathy_s_song.sg
@@ -7,7 +7,7 @@
   \gtab{G}{320003}
   \gtab{C}{X32010}
   \gtab{Am}{X02210}
-  \gtab{Am6}{2X2210}
+  \gtab*{Am6}{2X2210}
   \gtab{D7}{XX0212}
   \gtab{Bm}{2:X02210}
   \gtab{D}{XX0232}
diff --git a/songs/Simon_Garfunkel/The_only_living_boy_in_New_York.sg b/songs/Simon_Garfunkel/The_only_living_boy_in_New_York.sg
index 00da3b96..6c3a950f 100644
--- a/songs/Simon_Garfunkel/The_only_living_boy_in_New_York.sg
+++ b/songs/Simon_Garfunkel/The_only_living_boy_in_New_York.sg
@@ -9,7 +9,7 @@
   \gtab{Dm}{XX0231}
   \gtab{G}{320003}
   \gtab{Am}{X02210}
-  \gtab{G}{320001}
+  \gtab{G7}{320001}
 
   \begin{verse}
     \[C]Tom, get your plane right on \[F]time
diff --git a/songs/Sixpence_None_the_Richer/Kiss_me.sg b/songs/Sixpence_None_the_Richer/Kiss_me.sg
index 794d1562..193abefb 100644
--- a/songs/Sixpence_None_the_Richer/Kiss_me.sg
+++ b/songs/Sixpence_None_the_Richer/Kiss_me.sg
@@ -6,16 +6,15 @@
   \cover
   \capo{1}
   \gtab{D}{XX0232}
-  \gtab{DM7}{XX0222}
+  \gtab*{DM7}{XX0222}
   \gtab{D7}{XX0212}
   \gtab{Em}{022000}
   \gtab{A}{X02220}
   \gtab{G}{320003}
-  \gtab{D/C#}{X40232}
-  \gtab{D/B}{X20232}
-  \gtab{D/A}{XX0232}
-  \gtab{G*}{320030}
-  \gtab{Asus4}{X02230}
+  \gtab*{D/C#}{X40232}
+  \gtab*{D/B}{X20232}
+  \gtab*{G*}{320030}
+  \gtab*{Asus4}{X02230}
 
   \begin{verse*}
     \musicnote {\Intro: \nolyrics \[D DM7 D7 DM7 \rep{2}]}
@@ -43,4 +42,4 @@
     We'll take the trail marked on your father's map
   \end{verse}
 
-\endsong
\ No newline at end of file
+\endsong
diff --git a/songs/Soan/Putain_de_ballerine.sg b/songs/Soan/Putain_de_ballerine.sg
index b36d1304..cefd6a01 100644
--- a/songs/Soan/Putain_de_ballerine.sg
+++ b/songs/Soan/Putain_de_ballerine.sg
@@ -7,10 +7,9 @@
   \gtab{Em}{022000}
   \gtab{Am}{X02210}
   \gtab{D}{XX0232}
-  \gtab{G}{320001}
+  \gtab{G}{320003}
   \gtab{B7}{X21202}
 
-
   \begin{verse}
     C'est pas si \[Em]beau l'amour
     Quand c'est à toi qu'je pense
@@ -73,4 +72,4 @@
     Qui s'en \[Em]va ! \[B7] \[B7] \[Em] \[G] \[D] \[Em] \[B7]
   \end{verse}
 
-\endsong
\ No newline at end of file
+\endsong
diff --git a/songs/Soggy_Bottom_Boys/I_am_a_man_of_constant_sorrow.sg b/songs/Soggy_Bottom_Boys/I_am_a_man_of_constant_sorrow.sg
index 5a0bf653..f3aec637 100644
--- a/songs/Soggy_Bottom_Boys/I_am_a_man_of_constant_sorrow.sg
+++ b/songs/Soggy_Bottom_Boys/I_am_a_man_of_constant_sorrow.sg
@@ -1,12 +1,12 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{I am a man of constant sorrow}
-  [by=Soggy Bottom Boys,,cov=o-brother,album=O brother]
+  [by=Soggy Bottom Boys,cov=o-brother,album=O brother]
 
   \cover
   \gtab{F}{1:022100}
   \gtab{B&}{1:X02220}
-  \gtab{C}{1:X02220}
+  \gtab{C}{3:X02220}
 
   \begin{chorus}
     \[F] In constant \[C]sorrow, all through his \[F]days
@@ -67,4 +67,4 @@
     He'll meet you on God's golden shore
   \end{chorus}
 
-\endsong
\ No newline at end of file
+\endsong
diff --git a/songs/Soldat_Louis/C_est_un_pays.sg b/songs/Soldat_Louis/C_est_un_pays.sg
index ad48df41..f2a0cc28 100644
--- a/songs/Soldat_Louis/C_est_un_pays.sg
+++ b/songs/Soldat_Louis/C_est_un_pays.sg
@@ -86,7 +86,7 @@
       Dans \[Am]tout c'merdier c'putain d'pays
       M'tient \[G]plus chaud qu'la gon\[F]zesse que j'traîne
       J'ai \[C]pas fini d'l'ouvrir pour lui
-      Pour \[Dm]{lui j'filerai} même \[F]des chataîgnes
+      Pour \[Dm]{lui j'filerai} même \[F]des châtaignes
       Au \[C]premier salaud qui l'détruit
       Ou \[Dm]{qui voudrait} lui re\[F]mettre \[G]des \[Am]chaînes
       \nolyrics \[Am Am]
@@ -95,4 +95,4 @@
 
   \musicnote{\Verse 1 \rep{2}}
 
-\endsong
\ No newline at end of file
+\endsong
diff --git a/songs/Sting/Russians.sg b/songs/Sting/Russians.sg
index ad98d29f..528a0bdc 100644
--- a/songs/Sting/Russians.sg
+++ b/songs/Sting/Russians.sg
@@ -13,7 +13,7 @@
 
   \begin{verse}
     In \[Am]Europe \[G]and A\[F]meri\[E7]ca
-    There's a \[Am]growing \[G]feeling of his\[F]teri\[E7]a
+    There's a \[Am]growing \[G]feeling of hys\[F]teri\[E7]a
     Con\[Am]ditioned to res\[G]pond to \[F]all the \[E7]threats
     In the \[Am]rhetorical \[G]speeches of \[F]the So\[E7]viets
   \end{verse}
diff --git a/songs/Telephone/New_York_avec_toi.sg b/songs/Telephone/New_York_avec_toi.sg
index 5d2df6bf..83a37d2c 100644
--- a/songs/Telephone/New_York_avec_toi.sg
+++ b/songs/Telephone/New_York_avec_toi.sg
@@ -11,7 +11,7 @@
   \begin{verse}
     \[A]Un jour, j'irai a \[F#m]{New York} avec toi
     \[A]Toutes les nuits décon\[B]ner
-    \[A]Et voir aucun film en ent\[F#m]{ier, ca va} d'soi
+    \[A]Et voir aucun film en ent\[F#m]{ier, ça va} d'soi
     \[A]Avoir la vie partag\[B]{ée, taillad}\[D]ée
     \[A]Bercés par le ronron de l'air co\[F#m]nditionné
     \[A]Dormir dans un hôtel delat\[B]é
@@ -55,4 +55,4 @@
 
   \lilypond{New_york_avec_toi}
 
-\endsong
\ No newline at end of file
+\endsong
diff --git a/songs/Terra_Naomi/Say_It_s_Possible.sg b/songs/Terra_Naomi/Say_It_s_Possible.sg
index 6f943d2d..2f0be5b9 100644
--- a/songs/Terra_Naomi/Say_It_s_Possible.sg
+++ b/songs/Terra_Naomi/Say_It_s_Possible.sg
@@ -4,10 +4,10 @@
   [by=Terra Naomi,cov=under-the-influence,album=Under the influence]
 
   \cover
-  \gtab{Em7}{022033}
-  \gtab{C9}{X32033}
-  \gtab{G}{320033}
-  \gtab{G/F#}{2X0033}
+  \gtab*{Em7}{022033}
+  \gtab*{C9}{X32033}
+  \gtab*{G}{320033}
+  \gtab*{G/F#}{2X0033}
 
   \begin{verse}
     \[Em7]I \[C9]see the \[G]lights are \[G/F#]turning and I
diff --git a/songs/The_Beatles/Twist_and_shout.sg b/songs/The_Beatles/Twist_and_shout.sg
index a273b869..679756a5 100644
--- a/songs/The_Beatles/Twist_and_shout.sg
+++ b/songs/The_Beatles/Twist_and_shout.sg
@@ -7,7 +7,7 @@
   \gtab{D}{5:X02220}
   \gtab{G}{3:022100}
   \gtab{A}{5:022100}
-  \gtab{A7}{5:020130}
+  \gtab*{A7}{5:020130}
 
   \begin{chorus}
     \[A7]Well, shake it up, \[D]baby, now \echo{\[G]shake it up, \[A]baby}
diff --git a/songs/The_Calling/Wherever_you_will_go.sg b/songs/The_Calling/Wherever_you_will_go.sg
index 47e0b992..ffc83559 100644
--- a/songs/The_Calling/Wherever_you_will_go.sg
+++ b/songs/The_Calling/Wherever_you_will_go.sg
@@ -6,7 +6,7 @@
   \cover
   \capo{2}
   \gtab{C}{X32010}
-  \gtab{C/B}{X20010}
+  \gtab*{C/B}{X20010}
   \gtab{Am7}{X02010}
   \gtab{F}{1:022100}
 
diff --git a/songs/The_Doors/Light_my_fire.sg b/songs/The_Doors/Light_my_fire.sg
index 2d5fe4c3..35a2a620 100644
--- a/songs/The_Doors/Light_my_fire.sg
+++ b/songs/The_Doors/Light_my_fire.sg
@@ -5,7 +5,7 @@
 
   \cover
   \gtab{Am7}{X02010}
-  \gtab{F#m7}{202220}
+  \gtab*{F#m7}{202220}
   \gtab{G}{320003}
   \gtab{A}{X02220}
   \gtab{D}{XX0232}
diff --git a/songs/The_Fray/How_to_save_a_life.sg b/songs/The_Fray/How_to_save_a_life.sg
index 64539115..48327e29 100644
--- a/songs/The_Fray/How_to_save_a_life.sg
+++ b/songs/The_Fray/How_to_save_a_life.sg
@@ -6,7 +6,7 @@
   \cover
   \capo{3}
   \gtab{G}{320003}
-  \gtab{D4}{XX0233}
+  \gtab*{D4}{XX0233}
   \gtab{Em}{022000}
   \gtab{D}{XX0232}
   \gtab{C}{X32010}
diff --git a/songs/The_Moldy_Peaches/Anyone_Else_But_You.sg b/songs/The_Moldy_Peaches/Anyone_Else_But_You.sg
index c3378272..bfc27027 100644
--- a/songs/The_Moldy_Peaches/Anyone_Else_But_You.sg
+++ b/songs/The_Moldy_Peaches/Anyone_Else_But_You.sg
@@ -5,7 +5,7 @@
 
   \cover
   \gtab{G}{320003}
-  \gtab{C7}{X32003}
+  \gtab*{C7}{X32003}
 
   \begin{verse}
     You're a \[G]part time lover and a full time friend
diff --git a/songs/The_Nightwatchman/Let_freedom_ring.sg b/songs/The_Nightwatchman/Let_freedom_ring.sg
index 5a5eecd9..b999938f 100644
--- a/songs/The_Nightwatchman/Let_freedom_ring.sg
+++ b/songs/The_Nightwatchman/Let_freedom_ring.sg
@@ -9,8 +9,8 @@
   \gtab{Am}{X02210}
   \gtab{G}{320003}
   \gtab{C}{X32010}
-  \gtab{C/B}{X20010}
-  \gtab{F#}{200XXX}
+  \gtab*{C/B}{X20010}
+  \gtab*{F#}{200XXX}
 
   \musicnote[english]{\Intro: same chords as the chorus}
   \musicnote[french]{\Intro: même accords que le refrain}
diff --git a/songs/The_Pogues/The_Irish_Rover.sg b/songs/The_Pogues/The_Irish_Rover.sg
index 1af8bf64..da86c237 100644
--- a/songs/The_Pogues/The_Irish_Rover.sg
+++ b/songs/The_Pogues/The_Irish_Rover.sg
@@ -6,7 +6,7 @@
   \cover
   \gtab{G}{320003}
   \gtab{C}{X32010}
-  \gtab{D}{XXX0232}
+  \gtab{D}{XX0232}
 
   \begin{verse}
     \[G]On the fourth of July
diff --git a/songs/The_Rolling_Stones/You_cant_always_get_what_you_want.sg b/songs/The_Rolling_Stones/You_cant_always_get_what_you_want.sg
index 83aa38de..66fdd1d1 100644
--- a/songs/The_Rolling_Stones/You_cant_always_get_what_you_want.sg
+++ b/songs/The_Rolling_Stones/You_cant_always_get_what_you_want.sg
@@ -6,7 +6,7 @@
   \cover
   \capo{5}
   \gtab{G}{320003}
-  \gtab{C}{X32003}
+  \gtab*{C}{X32003}
   \gtab{A}{X02220}
 
   \begin{verse}
@@ -54,5 +54,4 @@
     Well I could tell by her bloodstained hands
   \end{verse}
 
-
 \endsong
diff --git a/songs/Thomas_Fersen/Bambi.sg b/songs/Thomas_Fersen/Bambi.sg
index a920b253..fff361a3 100644
--- a/songs/Thomas_Fersen/Bambi.sg
+++ b/songs/Thomas_Fersen/Bambi.sg
@@ -1,20 +1,20 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Bambi}
-  [by=Thomas Fersen,album=Pièce montée des grands jours,cov=piece-montee-des-grands-jours]
-
+  [by=Thomas Fersen,cov=piece-montee-des-grands-jours,album=Pièce montée des grands jours]
 
   \cover
   \gtab{Dm}{XX0231}
   \gtab{F}{1:022100}
-  \gtab{B{\flt}}{2:X02220}
+
+  \gtab{B&}{2:X02220}
   \gtab{G}{320003}
   \gtab{Am}{X02210}
   \gtab{C}{X32010}
   \gtab{A}{X02220}
   \utab{Dm}{2210}
   \utab{F}{2010}
-  \utab{B{\flt}}{1:2100}
+  \utab{B&}{1:2100}
   \utab{G}{0232}
   \utab{Am}{2000}
   \utab{C}{0003}
@@ -78,4 +78,5 @@
       \[Am]Pas casser les jouets\dots{}
     \end{chorus}
   \end{repeatedchords}
-\endsong
\ No newline at end of file
+
+\endsong
diff --git a/songs/Thomas_Fersen/Croque.sg b/songs/Thomas_Fersen/Croque.sg
index 23b1b7fe..4e5a9ed3 100644
--- a/songs/Thomas_Fersen/Croque.sg
+++ b/songs/Thomas_Fersen/Croque.sg
@@ -6,7 +6,7 @@
   \cover
   \gtab{C#m}{4:X02210}
   \gtab{F#m}{2:022000}
-  \gtab{G#}{320003}
+  \gtab{G#}{4:X02210}
   \gtab{E}{022100}
   \gtab{A}{X02220}
   \utab{C#m}{1:0333}
@@ -109,4 +109,4 @@
     \nolyrics \[C{\shrp}m F{\shrp}m F{\shrp}m C{\shrp}m]
   \end{chorus}
 
-\endsong
\ No newline at end of file
+\endsong
diff --git a/songs/Thomas_Fersen/Deux_pieds.sg b/songs/Thomas_Fersen/Deux_pieds.sg
index 72416d1a..5820e96d 100644
--- a/songs/Thomas_Fersen/Deux_pieds.sg
+++ b/songs/Thomas_Fersen/Deux_pieds.sg
@@ -7,7 +7,7 @@
   \gtab{Fm}{1:022000}
   \gtab{D#}{3:X32010}
   \gtab{G#}{4:022100}
-  \gtab{C#}{4:X03330}
+  \gtab{C#}{4:X02220}
   \gtab{Cm}{3:X02210}
   \utab{Fm}{1013}
   \utab{D#}{1:2220}
diff --git a/songs/Thomas_Fersen/Diane_de_Poitiers.sg b/songs/Thomas_Fersen/Diane_de_Poitiers.sg
index 846e9209..7e1c4b94 100644
--- a/songs/Thomas_Fersen/Diane_de_Poitiers.sg
+++ b/songs/Thomas_Fersen/Diane_de_Poitiers.sg
@@ -5,10 +5,9 @@
 
   \cover
   \gtab*{B&9}{X10111}
-  \gtab{B&7}{1:X0202}
+  \gtab{B&7}{1:X02020}
   \gtab{E&}{6:X02220}
   \gtab{F}{1:022100}
-
   \gtab{Gm}{3:022000}
   \gtab{B&}{6:022100}
   \gtab{Cm}{3:X02210}
diff --git a/songs/Thomas_Fersen/L_histoire_d_une_heure.sg b/songs/Thomas_Fersen/L_histoire_d_une_heure.sg
index 06388bd6..cfc4b88d 100644
--- a/songs/Thomas_Fersen/L_histoire_d_une_heure.sg
+++ b/songs/Thomas_Fersen/L_histoire_d_une_heure.sg
@@ -7,8 +7,8 @@
   \gtab{B7}{2:X02020}
   \gtab{E}{022100}
   \gtab{A}{X02220}
-  \gtab{Edim}{2:XX0131}
-  \gtab{F#dim}{XX4212}
+  \gtab*{Edim}{2:XX0131}
+  \gtab*{F#dim}{XX4212}
   \utab{B7}{2:0100}
   \utab{E}{2:2220}
   \utab{A}{2100}
@@ -98,4 +98,5 @@
     \nolyrics \[A E A E]
     \nolyrics \[Edim E F{\shrp}dim B7]
   \end{verse*}
+
 \endsong
diff --git a/songs/Thomas_Fersen/Les_malheurs_du_lion.sg b/songs/Thomas_Fersen/Les_malheurs_du_lion.sg
index 778c798e..fb1bf902 100644
--- a/songs/Thomas_Fersen/Les_malheurs_du_lion.sg
+++ b/songs/Thomas_Fersen/Les_malheurs_du_lion.sg
@@ -7,12 +7,13 @@
   \gtab{Cm}{3:X02210}
   \gtab{G}{320003}
   \gtab{A#}{1:X02220}
-  \gtab{D#}{XX1343}
+  \gtab{D#}{6:X02220}
   \gtab{Fm}{1:022000}
   \utab{Cm}{0333}
   \utab{G}{0232}
-  \utab{A{\shrp}}{2100}
-  \utab{D{\shrp}}{1:2220}
+
+  \utab{A#}{2100}
+  \utab{D#}{1:2220}
   \utab{Fm}{1013}
 
   \begin{chorus}
@@ -99,8 +100,8 @@
     \end{verse}
 
     \begin{bridge}
-        Ta ba \[Cm]da ba da ba da\dots{}
+      Ta ba \[Cm]da ba da ba da\dots{}
     \end{bridge}
   \end{repeatedchords}
 
-\endsong
\ No newline at end of file
+\endsong
diff --git a/songs/Thomas_Fersen/Pegase.sg b/songs/Thomas_Fersen/Pegase.sg
index d9f88bee..b563364e 100644
--- a/songs/Thomas_Fersen/Pegase.sg
+++ b/songs/Thomas_Fersen/Pegase.sg
@@ -1,10 +1,10 @@
 \selectlanguage{french}
 \songcolumns{1}
 \beginsong{Pégase}
-  [by=Thomas Fersen,album=Le pavillon des fous,cov=le-pavillon-des-fous]
+  [by=Thomas Fersen,cov=le-pavillon-des-fous,album=Le pavillon des fous]
 
   \cover
-  \gtab{Em}{0022000}
+  \gtab{Em}{022000}
   \gtab{G}{320003}
   \gtab{Bm}{2:X02210}
   \gtab{C}{X32010}
@@ -56,4 +56,4 @@
     \end{verse}
   \end{repeatedchords}
 
-\endsong
\ No newline at end of file
+\endsong
diff --git a/songs/Thomas_Fersen/Zaza.sg b/songs/Thomas_Fersen/Zaza.sg
index c110730d..e00637ad 100644
--- a/songs/Thomas_Fersen/Zaza.sg
+++ b/songs/Thomas_Fersen/Zaza.sg
@@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Zaza}
-  [by=Thomas Fersen,album=Le pavillon des fous,cov=le-pavillon-des-fous]
+  [by=Thomas Fersen,cov=le-pavillon-des-fous,album=Le pavillon des fous]
 
   \cover
   \gtab{Em}{022000}
@@ -43,7 +43,7 @@
       Pis Zaza, \[Em]c'est quoi ton problème ?
       Arrête d'in\[Em]gérer tout ce qui traîne
       Croquer ma \[Am]revue sur les gaines
-      Ça va pas \[D]te rafraichir l'ha\[Em]leine
+      Ça va pas \[D]te rafraîchir l'ha\[Em]leine
     \end{verse}
 
     \begin{verse*}
diff --git a/songs/Tit_Patapons/Marchand_de_couleurs.sg b/songs/Tit_Patapons/Marchand_de_couleurs.sg
index 3af8162d..670f006b 100644
--- a/songs/Tit_Patapons/Marchand_de_couleurs.sg
+++ b/songs/Tit_Patapons/Marchand_de_couleurs.sg
@@ -5,9 +5,9 @@
 
   \cover
   \gtab{Am}{X02210}
-  \gtab{Asus4}{X02230}
-  \gtab{Asus2}{X02200}
-  \gtab{Am7}{X02213}
+  \gtab*{Asus4}{X02230}
+  \gtab*{Asus2}{X02200}
+  \gtab*{Am7}{X02213}
   \gtab{F}{1:022100}
   \gtab{C}{X32010}
 
diff --git a/songs/Tournee_Generale/Avancer_mes_grolles.sg b/songs/Tournee_Generale/Avancer_mes_grolles.sg
index 3cc47975..17c6cd12 100644
--- a/songs/Tournee_Generale/Avancer_mes_grolles.sg
+++ b/songs/Tournee_Generale/Avancer_mes_grolles.sg
@@ -20,7 +20,7 @@
 
   \begin{repeatedchords}
     \begin{verse*}
-      \[Dm]Tu te résignes, persites et signes
+      \[Dm]Tu te résignes, persistes et signes
       Que je ne \[B&]suis qu'un \[C]pot de \[F]colle
       Mais ça n'colle \[A]pas, je passe à la \[Dm]ligne
       Pour faire \[B&]avan\[A]cer mes \[Dm]grolles
diff --git a/songs/Tracy_Chapman/Talkin_about_the_revolution.sg b/songs/Tracy_Chapman/Talkin_about_the_revolution.sg
index 0c8e3970..de08bb11 100644
--- a/songs/Tracy_Chapman/Talkin_about_the_revolution.sg
+++ b/songs/Tracy_Chapman/Talkin_about_the_revolution.sg
@@ -5,15 +5,15 @@
 
   \cover
   \gtab{G}{320003}
-  \gtab{Cadd9}{032030}
+  \gtab*{Cadd9}{032030}
   \gtab{Em}{022000}
-  \gtab{Dsus4}{X00233}
+  \gtab*{Dsus4}{X00233}
   \gtab{D}{XX0232}
 
   \begin{chorus}
     D\[G]on't you \[Cadd9]know
-    \[Em]They're talkin' about\[Dsus4]a revolu\[G]tion
-    It\[Cadd9]sounds \[Em]like \[D]a whisper
+    \[Em]They're talkin' about \[Dsus4]a revolu\[G]tion
+    It \[Cadd9]sounds \[Em]like \[D]a whisper
     Don't you know
     They're talkin' about a revolution
     It sounds like a whisper
@@ -29,7 +29,7 @@
   \begin{chorus}
     D\[G]on't you \[Cadd9]know
     \[Em]They're talkin' about \[Dsus4]a revolu\[G]tion
-    It\[Cadd9]sounds \[Em]like \[D]a whisper
+    It \[Cadd9]sounds \[Em]like \[D]a whisper
     Don't you know
     They're talkin' about a revolution
     It sounds like a whisper
diff --git a/songs/Traditionnel/L_homme_de_cromagnon.sg b/songs/Traditionnel/L_homme_de_cromagnon.sg
index a12b23db..2bbced8b 100644
--- a/songs/Traditionnel/L_homme_de_cromagnon.sg
+++ b/songs/Traditionnel/L_homme_de_cromagnon.sg
@@ -1,6 +1,6 @@
 \selectlanguage{french}
 \songcolumns{2}
-\beginsong{L'homme de cromagnon}
+\beginsong{L'homme de Cro-Magnon}
   [by=Traditionel]
 
   \gtab{C}{X32010}
@@ -12,18 +12,18 @@
     C'était au \[C]temps d'la préhistoire
     Il y a de ça trois cent mille \[G7]ans
     Vivait un être assez bizarre
-    Proche parent d'l'orang-out\[C]ang
+    Proche parent d'l'orang-out\[C]an
     Debout sur ses pattes de derrière
     Vêtu d'un slip en peau d'bi\[G7]son
     Il all\[F]ait conqué\[G]rir la \[C]terre
-    C'était l'homme \[G]de cromag\[C]non
+    C'était l'homme \[G]de Cro-Mag\[C]non
   \end{verse}
 
   \begin{chorus}
     L'homme de \[C]cro, l'homme de ma, l'homme de gnon
-    L'\[G7]homme de cromagn\[C]on \echo{bouh !}
+    L'\[G7]homme de Cro-Magn\[C]on \echo{bouh !}
     L'\[F]homme de cro, de mag\[C]non c'était pas du bi\[G]don
-    L'homme de croma\[C]gnon \rep{2}
+    L'homme de Cro-Ma\[C]gnon \rep{2}
   \end{chorus}
 
   \begin{verse}
diff --git a/songs/Traditionnel/La_cucaracha.sg b/songs/Traditionnel/La_cucaracha.sg
index 9fefea8d..b2b5cc1b 100644
--- a/songs/Traditionnel/La_cucaracha.sg
+++ b/songs/Traditionnel/La_cucaracha.sg
@@ -10,7 +10,7 @@
     La cuca\[C]racha, la cucaracha
     Ya no puede cami\[G]nar
     Porque no tiene, porque le falta
-    Marijuana que fu\[C]mar
+    Marihuana que fu\[C]mar
   \end{verse}
 
 \endsong
diff --git a/songs/Tryo/Le_petit_chose.sg b/songs/Tryo/Le_petit_chose.sg
index e331ba4a..75730a2e 100644
--- a/songs/Tryo/Le_petit_chose.sg
+++ b/songs/Tryo/Le_petit_chose.sg
@@ -3,7 +3,6 @@
 \beginsong{Le petit chose}
   [by=Tryo,cov=faut-qu-ils-s-activent,album=Faut qu'ils s'activent]
 
-
   \cover
   \gtab{Dm}{5:X02210}
   \gtab{A}{5:022100}
@@ -11,12 +10,11 @@
   \gtab{A#}{6:022100}
   \gtab{C}{8:022100}
 
-
   \begin{verse}
     On a \[Dm]tous nos intérieurs, nos petits \[A]choses
     Ce qui \[Dm]fait au fond de nous qu'on est tout d'\[A]même quelque chose
     Celui qui \[Gm]gratte ou qui s'ti\[Dm]tille
-    Celui qui \[A]dort ou qui s'ra\[Dm]bille
+    Celui qui \[A]dort ou qui s'rha\[Dm]bille
     Le petit \[A]chose au fond d'son \[A#]âme
     Qui nous com\[C]prend ou qui s'pa\[A]vane
   \end{verse}
diff --git a/songs/Vincent_Malone/L_escargot_malheureux.sg b/songs/Vincent_Malone/L_escargot_malheureux.sg
index 4a0ef76e..9717a9ab 100644
--- a/songs/Vincent_Malone/L_escargot_malheureux.sg
+++ b/songs/Vincent_Malone/L_escargot_malheureux.sg
@@ -10,7 +10,7 @@
 
   \begin{verse}
     \[C]Il était une fois un petit \[F]escargot
-    \[C]Qui se balançait en haut d'un \[G7]esca\[C]bot
+    \[C]Qui se balançait en haut d'un \[G7]esca\[C]beau
     \[C]Mais voilà qu'il s'affole
     \[F]Que tout dégringole :
     {\og}Ah zut, flûte et pomme de terre
@@ -28,5 +28,3 @@
   \end{verse}
 
 \endsong
-
-
diff --git a/songs/Yodelice/Sunday_with_a_flu.sg b/songs/Yodelice/Sunday_with_a_flu.sg
index e3b7e752..21a9eeee 100644
--- a/songs/Yodelice/Sunday_with_a_flu.sg
+++ b/songs/Yodelice/Sunday_with_a_flu.sg
@@ -16,7 +16,7 @@
   \begin{verse}
     \[Bm]Closed my door, forgot my key
     Missed my bus in the pouring rain
-    It's \[G]been the usual su\[D]nday with a flu \[Bm]
+    It's \[G]been the usual Su\[D]nday with a flu \[Bm]
     \[G]And I just can't \[D]get over you \[Bm]
   \end{verse}
 
diff --git a/songs/Yuki_Kajiura/Vanity.sg b/songs/Yuki_Kajiura/Vanity.sg
index 8298cf5a..92eee346 100644
--- a/songs/Yuki_Kajiura/Vanity.sg
+++ b/songs/Yuki_Kajiura/Vanity.sg
@@ -8,7 +8,7 @@
   \gtab{G}{320003}
   \gtab{F}{1:022100}
   \gtab{C}{X32010}
-  \gtab{C/B}{X20010}
+  \gtab*{C/B}{X20010}
   \gtab{E7}{X20100}
 
   \lilypond{Vanity}