diff --git a/songs/Alicia_Keys/If_aint_got_you.sg b/songs/Alicia_Keys/If_aint_got_you.sg
index 8caf9c5d..3a86b8e9 100644
--- a/songs/Alicia_Keys/If_aint_got_you.sg
+++ b/songs/Alicia_Keys/If_aint_got_you.sg
@@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{If I ain't got you}
-  [by={Alicia Keys},cov={If_aint_got_you},album={The diary of Alicia Keys}]
+  [by={Alicia Keys},cov={if_aint_got_you},album={The diary of Alicia Keys}]
 
   \cover
   \gtab{G7}{320001}
diff --git a/songs/America/A_Horse_With_No_Name.sg b/songs/America/A_Horse_With_No_Name.sg
index 63307939..fe933bea 100644
--- a/songs/America/A_Horse_With_No_Name.sg
+++ b/songs/America/A_Horse_With_No_Name.sg
@@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{A horse with no name}
-  [by={America},cov={America},album={America}]
+  [by={america},cov={america},album={america}]
 
   \cover
   \gtab{Em}{022000}
diff --git a/songs/Avenue_Q/The_internet_is_for_porn.sg b/songs/Avenue_Q/The_internet_is_for_porn.sg
index adc7e5d1..561c2309 100644
--- a/songs/Avenue_Q/The_internet_is_for_porn.sg
+++ b/songs/Avenue_Q/The_internet_is_for_porn.sg
@@ -27,13 +27,13 @@
   \end{chorus}
 
   \begin{verse*}
-    ``Treekkie!
-    --- Oh hello Kate Monster!
-    --- You are ruining my song
-    --- Oh me sorry, me no mean to
-    --- Well if you wouldn't mind please being quiet for a minute so I can finish?
-    --- Oki doki
-    --- Good''
+    ``Treekkie!''
+    ``Oh hello Kate Monster!''
+    ``You are ruining my song''
+    ``Oh me sorry, me no mean to''
+    ``Well if you wouldn't mind please being quiet for a minute so I can finish?''
+    ``Oki doki''
+    ``Good''
   \end{verse*}
 
   \begin{verse}
@@ -52,14 +52,14 @@
   \end{chorus}
 
   \begin{verse*}
-    ``That's gross, you're a pervert
-    --- Ah, sticks and stones Kate monster
-    --- No really, you're a pervert. Normal people don't sit at home and look at porn on the Internet
-    --- Oh?
-    --- What?
-    --- You have no idea! Ready normal people?
-    --- Ready. Ready. Ready
-    --- Let me hear it!''
+    ``That's gross, you're a pervert!''
+    ``Ah, sticks and stones Kate monster.''
+    ``No really, you're a pervert. Normal people don't sit at home and look at porn on the Internet.''
+    ``Oh?''
+    ``What?''
+    ``You have no idea! Ready normal people?''
+    ``Ready. Ready. Ready!''
+    ``Let me hear it!''
   \end{verse*}
 
   \begin{chorus}
@@ -70,15 +70,15 @@
   \end{chorus}
 
   \begin{verse*}
-    ``The Internet is not for porn!
-    --- Porn, Porn, P\dots
-    --- Hold on a second!
+    ``The Internet is not for porn!''
+    ``Porn, Porn, P\dots''
+    ``Hold on a second!
     Now I know for a fact that you, Rob, check your portfolio and trade stocks online \echo{That's correct}
     And Brian, you buy things on amazon.com \echo{Sure!}
     And Gary, you keep selling your possessions on eBay \echo{Yes I do!}
-    And Princeton, you sent me that sweet online birthday card \echo{True!}
-    --- Oh, but Kate, what you think he do \dots after? Hmm? \echo{Yeah!}
-    --- Eeewwwww!''
+    And Princeton, you sent me that sweet online birthday card'' \echo{True!}
+    ``Oh, but Kate, what you think he do \dots after? Hmm?'' \echo{Yeah!}
+    ``Eeewwwww!''
   \end{verse*}
 
   \begin{chorus}
diff --git a/songs/Bob_Dylan/Don_t_think_twice_it_s_all_right.sg b/songs/Bob_Dylan/Don_t_think_twice_it_s_all_right.sg
index acc2073a..47e69528 100644
--- a/songs/Bob_Dylan/Don_t_think_twice_it_s_all_right.sg
+++ b/songs/Bob_Dylan/Don_t_think_twice_it_s_all_right.sg
@@ -3,6 +3,7 @@
 \beginsong{Don't think twice, it's all right}
   [by={Bob Dylan},cov={the-freewheelin},album={The freewheelin}]
 
+  \cover
   \capo{4}
   \gtab{C}{X32010}
   \gtab{G7}{320001}
diff --git a/songs/Cranberries/Animal_instinct.sg b/songs/Cranberries/Animal_instinct.sg
index 3a1a138a..6d663658 100644
--- a/songs/Cranberries/Animal_instinct.sg
+++ b/songs/Cranberries/Animal_instinct.sg
@@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Animal instinct}
-  [by={Cranberries},cov={bury-the-hatchet},album={Bury the hatchet}]
+  [by={The Cranberries},cov={bury-the-hatchet},album={Bury the hatchet}]
 
   \cover
   \gtab{Em}{022000}
diff --git a/songs/Cranberries/Zombie.sg b/songs/Cranberries/Zombie.sg
index 053cf260..e75ff50d 100644
--- a/songs/Cranberries/Zombie.sg
+++ b/songs/Cranberries/Zombie.sg
@@ -1,40 +1,40 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Zombie}
-  [by={Cranberries},cov={no-need-to-argue},album={No need to argue}]
+  [by={The Cranberries},cov={no-need-to-argue},album={No need to argue}]
 
   \cover
   \gtab{Em}{022000}
-  \gtab*{C}{332010}
+  \gtab{C}{X32010}
   \gtab*{G}{3200XX}
-  \gtab{F#m}{2:0220XX}
+  \gtab{D}{XX0232}
 
   \begin{verse}
     \[Em]Another \[C]head hangs lowly
-    \[G]Child is slowly \[F#m]taken
+    \[G]Child is slowly \[D]taken
     \[Em]And the violence \[C]caused such silence
-    \[G]Who are we mis\[F#m]taken
+    \[G]Who are we mis\[D]taken
   \end{verse}
 
   \begin{verse*}
     But you \[Em]see, it's not me
     It's not \[C]my family
     In your \[G]head, in your head
-    They are figh\[F#m]ting
+    They are figh\[D]ting
   \end{verse*}
 
   \begin{chorus}
     With their \[Em]tanks and their bombs
     And their \[C]bombs and their guns
     In your \[G]head, in your head
-    They are \[F#m]crying
+    They are \[D]crying
   \end{chorus}
 
   \begin{chorus}
     In your \[Em]head, in your \[C]head
-    Zombie, \[G]zombie, zombi\[F#m]e
+    Zombie, \[G]zombie, zombi\[D]e
     What's in your \[Em]head, in your \[C]head
-    Zombie, \[G]zombie, zombi\[F#m]e
+    Zombie, \[G]zombie, zombi\[D]e
   \end{chorus}
 
   \begin{verse}
diff --git a/songs/Debout_Sur_Le_Zinc/Aller_simple.sg b/songs/Debout_Sur_Le_Zinc/Aller_simple.sg
index d07b882b..cc370a94 100644
--- a/songs/Debout_Sur_Le_Zinc/Aller_simple.sg
+++ b/songs/Debout_Sur_Le_Zinc/Aller_simple.sg
@@ -48,7 +48,7 @@
     \begin{verse*}
       \[Am] Ce que j'at\[Em]tends de toi, \[C] ce que j'ose es\[D]pérer
       \[Am] Ça n'est pas \[Em]{c'que} tu crois mais \[C]ça n'est pas com\[D]pliqué
-      \[Am] Je rève d'un \[Em]autre toi qui \[C]donne sans arrière-\[D]pensée
+      \[Am] Je rêve d'un \[Em]autre toi qui \[C]donne sans arrière-\[D]pensée
       \[Am] Il m'en faut \[Em]plus que ça pour te \[D]pardonner de m'ou\[F]blier
     \end{verse*}
 
diff --git a/songs/Debout_Sur_Le_Zinc/Elle_m_ennuie.sg b/songs/Debout_Sur_Le_Zinc/Elle_m_ennuie.sg
index 9f927565..1cee2ec0 100644
--- a/songs/Debout_Sur_Le_Zinc/Elle_m_ennuie.sg
+++ b/songs/Debout_Sur_Le_Zinc/Elle_m_ennuie.sg
@@ -5,12 +5,14 @@
   url={http://www.dslz.org}]
 
   \cover
-  \gtab{Dm}{XX0231}
+  \gtab{Dm}{5:X02210}
   \gtab{Gm}{3:022000}
-  \gtab{A7}{X02020}
+  \gtab{A7}{5:020100}
+  \gtab{B&}{6:022100}
   \utab{Dm}{2210}
   \utab{Gm}{0231}
   \utab{A7}{0100}
+  \utab{B&}{1:2100}
 
   \begin{verse*}
     \musicnote{\Intro :}
@@ -30,7 +32,7 @@
       Des \[Dm]fesses made in tungstène
       Un \[Gm]goût parfum roudoudou
       \[A7]Une peau terre de Sienne
-      Une voix qui \[Dm]fait : {\og}Ah doudou, ah doudoudoudou{\fg}
+      Une voix qui \[Dm]fait : {\og}Ah doudou, ah poupoupidou{\fg}
     \end{verse*}
 
     \begin{verse*}
@@ -49,15 +51,17 @@
   \end{repeatedchords}
 
   \begin{chorus}
-    Elle \[Gm]{m'ennuie}, m'ennuie, m'ennuie
+    Elle \[B&]{m'ennuie}, m'ennuie, m'ennuie
     Elle \[Dm]{m'ennuie}, m'ennuie, m'ennuie
-    Elle \[Gm]{m'ennuie} du \[A7]lundi jusqu'au lundi
-    Elle \[Gm]{m'ennuie}, m'ennuie, m'ennuie
+    Elle \[B&]{m'ennuie} du \[A7]lundi jusqu'au lun\[Dm]di
+    Elle \[B&]{m'ennuie}, m'ennuie, m'ennuie
     Elle \[Dm]{m'ennuie}, m'ennuie, m'ennuie
-    Elle \[Gm]{m'ennuie} même \[A7]pendant la \[Dm]nuit
+    Elle \[B&]{m'ennuie} même \[A7]pendant la \[Dm]nuit
   \end{chorus}
 
-  \musicnote{\Bridge : \nolyrics \[Dm Gm A7 Dm \rep{2}]}
+  \begin{verse*}
+    \musicnote{\Bridge : \nolyrics \[Dm Gm A7 Dm] \rep{2}}
+  \end{verse*}
 
   \begin{repeatedchords}
     \begin{verse}
diff --git a/songs/Dessins_Animes/I_Wanna_be_like_you.sg b/songs/Dessins_Animes/I_Wanna_be_like_you.sg
index 1c7bd8e9..57f585db 100644
--- a/songs/Dessins_Animes/I_Wanna_be_like_you.sg
+++ b/songs/Dessins_Animes/I_Wanna_be_like_you.sg
@@ -1,87 +1,91 @@
 \selectlanguage{english}
 \songcolumns{2}
-\beginsong{Le livre de la jungle: I wanna be like you}
+\beginsong{The jungle book: I wanna be like you}
   [by={Dessins Animés},cov={the-jungle-book},album={The jungle book}]
 
   \cover
-  \gtab{Em}{7:X02210}
-  \gtab{B7}{7:020100}
-  \gtab{D7}{5:X02020}
-  \gtab{G}{3:022100}
-  \gtab{E7}{5:X2120X}
-  \gtab{A7}{5:020100}
+  \gtab{Cm}{3:X02210}
+  \gtab{G7}{3:020100}
+  \gtab{B&7}{1:X02020}
+  \gtab{E&7}{6:X02020}
+  \gtab{C7}{X32310}
+  \gtab{F7}{1:020100}
 
   \begin{verse}
-    Now \[Em]{I'm} the king of the swingers
-    Oh, the jungle \[B7]VIP
+    Now \[Cm]{I'm} the king of the swingers, oh
+    The jungle \[G7]VIP
     I've reached the top and had to stop
-    And that's what botherin' \[Em]me
+    And that's what botherin' \[Cm]me \[G7]
   \end{verse}
 
-  \begin{verse*}
-    I wanna be a man, mancub
-    And stroll right into town
-    And be just like the other men
-    I'm tired of monkeyin' around!
-  \end{verse*}
+  \begin{repeatedchords}
+    \begin{verse*}
+      I \[Cm]wanna be a man, mancub
+      And stroll right into \[G7]town
+      And be just like the other men
+      I'm tired of monkeyin' a\[Cm]round, \[B&7]oh
+    \end{verse*}
+  \end{repeatedchords}
 
   \begin{chorus}
-    \[D7]Oh, \[G]oo bee doo
-    I wanna be like \[E7]you
-    I wanna \[A7]walk like you
-    \[D7]Talk like you, \[G]too
+    \[E&7]Oo bee doo
+    I wanna be like \[C7]you
+    I wanna \[F7]walk like you
+    \[B&7]Talk like you, \[E&7]too \[B&7]
   \end{chorus}
 
   \begin{chorus}
-    \[D7]You'll see it's \[G]true
-    An \[E7]ape like me
-    Can \[A7]learn to be
-    \[D7]Human \[G]too \[B7]
+    You'll see it's \[E&7]true
+    An ape like \[C7]me
+    Can \[F7]learn to be
+    \[B&7]Human \[E&7]too \[G7]
   \end{chorus}
 
   \textnote[english]{spoken}
   \textnote[french]{parlé}
   \begin{verse*}
     ``Gee, cousin Louie
-    You're doin' real good!
-    -Now here's your part of the deal, cuz
-    Lay the secret on me of man's red fire
-    -But I don't know how to make fire!''
+    You're doin' real good!''
+    ``Now here's your part of the deal, cuz
+    Lay the secret on me of man's red fire''
+    ``But I don't know how to make fire!''
   \end{verse*}
 
-  \begin{verse}
-    Now don't try to kid me, mancub
-    I made a deal with you
-    What I desire is man's red fire
-    To make my dream come true
-  \end{verse}
+  \begin{repeatedchords}
+    \begin{verse}
+      Now \[Cm]{don't} try to kid me, mancub
+      I made a deal with \[G7]you
+      What I desire is man's red fire
+      To make my dream come \[Cm]true \[G7]
+    \end{verse}
 
-  \begin{verse*}
-    Give me the secret, mancub
-    Clue me what to do
-    Give me the power of man's red flower
-    So I can be like you
-  \end{verse*}
+    \begin{verse*}
+      Now, \[Cm]give me the secret, mancub
+      Come on, clue me what to \[G7]do
+      Give me the power of man's red flower
+      So I can be like \[Cm]you \[B&7]
+    \end{verse*}
 
-  \begin{chorus}
-    You!
-    I wanna be like you
-    I wanna talk like you
-    Walk like you, too
-  \end{chorus}
+    \begin{chorus}
+      \[E&7]You!
+      I wanna be like \[C7]you
+      I wanna \[F7]walk like you
+      \[B&7]Talk like you, \[E&7]too \[B&7]
+    \end{chorus}
 
-  \begin{chorus}
-    You'll see it's true
-    Someone like me
-    Can learn to be
-    Like someone like me
-  \end{chorus}
+    \begin{chorus}
+      You'll see it's \[E&7]true
+      Someone like \[C7]me
+      Can \[F7]learn to be
+      \[B&7]Like someone like \[E&7]me!
+    \end{chorus}
+  \end{repeatedchords}
 
   \begin{chorus}
-    Can learn to be
-    Like someone like you
-    Can learn to be
-    Like someone like me!
+    Can \[F7]learn to be
+    \[B&7]Like someone like \[E&7]you \echo{One more time! Yeah!}
+    Can \[F7]learn to be
+    \[B&7]Like someone like \[E&7]me!
   \end{chorus}
 
 \endsong
diff --git a/songs/Howie_Day/Collide.sg b/songs/Howie_Day/Collide.sg
index 10f28929..13ed758b 100644
--- a/songs/Howie_Day/Collide.sg
+++ b/songs/Howie_Day/Collide.sg
@@ -10,8 +10,8 @@
   \gtab*{C}{032033}
 
   \begin{verse}
-    \[G+] The dawn is \[D+]breaking
-    \[Em+] A light shi\[C+]ning through
+    \[G] The dawn is \[D]breaking
+    \[Em] A light shi\[C]ning through
     You're barely waking
     And I'm tangled up in you
     Yeah
diff --git a/songs/Hugues_Aufray/Le_Bon_Dieu_s_enervait.sg b/songs/Hugues_Aufray/Le_Bon_Dieu_s_enervait.sg
index 1915c526..84b3fe6b 100644
--- a/songs/Hugues_Aufray/Le_Bon_Dieu_s_enervait.sg
+++ b/songs/Hugues_Aufray/Le_Bon_Dieu_s_enervait.sg
@@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Le Bon Dieu s'énervait}
-  [by={Hugues Aufray}]
+  [by={Hugues Aufray},cov={celine},album={Céline}]
 
 
   \cover
diff --git a/songs/Hugues_Aufray/Tu_sens_bon_la_terre.sg b/songs/Hugues_Aufray/Tu_sens_bon_la_terre.sg
index a75d9636..b1d49a50 100644
--- a/songs/Hugues_Aufray/Tu_sens_bon_la_terre.sg
+++ b/songs/Hugues_Aufray/Tu_sens_bon_la_terre.sg
@@ -1,8 +1,9 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Tu sens bon la terre}
-  [by={Hugues Aufray}]
+  [by={Hugues Aufray},cov={gold},album={Gold}]
 
+  \cover
   \gtab{Dm}{5:X02210}
   \gtab{A7}{5:020100}
   \gtab{C}{3:X02220}
diff --git a/songs/Jason_Marz/I_m_yours.sg b/songs/Jason_Marz/I_m_yours.sg
index a21d5e3e..d0f7f003 100644
--- a/songs/Jason_Marz/I_m_yours.sg
+++ b/songs/Jason_Marz/I_m_yours.sg
@@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{I'm yours}
-  [by={Jason Marz},cov={I_m_yours},album={I'm yours}]
+  [by={Jason Marz},cov={i_m_yours},album={I'm yours}]
 
   \cover
   \gtab{B}{2:X02220}
diff --git a/songs/Jeanne_Moreau/Le_tourbillon_de_la_vie.sg b/songs/Jeanne_Moreau/Le_tourbillon_de_la_vie.sg
index 0866c344..b2732123 100644
--- a/songs/Jeanne_Moreau/Le_tourbillon_de_la_vie.sg
+++ b/songs/Jeanne_Moreau/Le_tourbillon_de_la_vie.sg
@@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Le tourbillon de la vie}
-  [by={Jeanne Moreau},cov={BOF-Jules-et-Jim},album={BOF Jules et Jim}]
+  [by={Jeanne Moreau},cov={bof-jules-et-jim},album={BOF Jules et Jim}]
 
   \cover
   \gtab{A}{X02220}
diff --git a/songs/Joan_Baez/Here_s_to_you.sg b/songs/Joan_Baez/Here_s_to_you.sg
index d955ed4a..c486c669 100644
--- a/songs/Joan_Baez/Here_s_to_you.sg
+++ b/songs/Joan_Baez/Here_s_to_you.sg
@@ -1,8 +1,9 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Here's to you}
-  [by={Joan Baez}]
+  [by={Joan Baez},cov={sacco_vanzetti},album={Sacco et Vanzetti}]
 
+  \cover
   \gtab{C}{X32010}
   \gtab{G7}{320001}
   \gtab{Am}{X02210}
diff --git a/songs/Johk/La_reine_de_France.sg b/songs/Johk/La_reine_de_France.sg
index 14293f4e..430210cc 100644
--- a/songs/Johk/La_reine_de_France.sg
+++ b/songs/Johk/La_reine_de_France.sg
@@ -1,11 +1,12 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{La reine de France}
-  [by={Johk}]
+  [by={Johk},cov={matiere_grise},album={0\% de matière grise}]
 
+  \cover
   \gtab{A}{X02220}
   \gtab{E}{022100}
-  \gtab{F#m}{1:022000}
+  \gtab{F#m}{2:022000}
   \gtab{D}{XX0232}
 
   \begin{verse}
diff --git a/songs/Johnny_Cash/Jackson.sg b/songs/Johnny_Cash/Jackson.sg
index b5cca8e8..6b44d9ae 100644
--- a/songs/Johnny_Cash/Jackson.sg
+++ b/songs/Johnny_Cash/Jackson.sg
@@ -34,8 +34,8 @@
   \begin{chorus}
     Yeah, go to Jackson
     Go comb your hair!
-    ``Honey, I'm gonna snowball Jackson
-    --- See if I care''
+    ``Honey, I'm gonna snowball Jackson''
+    ``See if I care''
   \end{chorus}
 
   \begin{verse}
diff --git a/songs/La_Rue_Ketanou/en-attendant-les-caravanes.jpg b/songs/La_Rue_Ketanou/en-attendant-les-caravanes.jpg
index a64636eb..5f05aafe 100644
Binary files a/songs/La_Rue_Ketanou/en-attendant-les-caravanes.jpg and b/songs/La_Rue_Ketanou/en-attendant-les-caravanes.jpg differ
diff --git a/songs/Les_Booze_Brothers/Fields_of_Athenry.sg b/songs/Les_Booze_Brothers/Fields_of_Athenry.sg
index 9e9f6452..52f13d1b 100644
--- a/songs/Les_Booze_Brothers/Fields_of_Athenry.sg
+++ b/songs/Les_Booze_Brothers/Fields_of_Athenry.sg
@@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Fields of Athenry}
-  [by={Les Booze Brothers},cov={elevator},album={Elevator}]
+  [by={Booze Brothers},cov={elevator},album={Elevator}]
 
   \cover
   \gtab{D}{XX0232}
diff --git a/songs/Les_Booze_Brothers/I_want_sex.sg b/songs/Les_Booze_Brothers/I_want_sex.sg
index 29847821..6ae1c9f9 100644
--- a/songs/Les_Booze_Brothers/I_want_sex.sg
+++ b/songs/Les_Booze_Brothers/I_want_sex.sg
@@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{I want sex}
-  [by={Les Booze Brothers},cov={elevator},album={Elevator}]
+  [by={Booze Brothers},cov={elevator},album={Elevator}]
 
   \cover
   \gtab{D}{XX0232}
diff --git a/songs/Les_Cowboys_Fringants/Etoiles_filantes.sg b/songs/Les_Cowboys_Fringants/Etoiles_filantes.sg
index ccfb3607..acf09aeb 100644
--- a/songs/Les_Cowboys_Fringants/Etoiles_filantes.sg
+++ b/songs/Les_Cowboys_Fringants/Etoiles_filantes.sg
@@ -1,6 +1,6 @@
 \selectlanguage{french}
 \songcolumns{2}
-\beginsong{Les étoiles filantes}
+\beginsong{Étoiles filantes}
   [by={Les Cowboys Fringants},cov={la-grand-messe},album={La grand messe}]
 
   \cover
@@ -8,10 +8,6 @@
   \gtab{G}{320003}
   \gtab{Em}{022000}
   \gtab{F}{1:022100}
-  \utab{Am}{2000}
-  \utab{G}{0232}
-  \utab{Em}{0432}
-  \utab{F}{2010}
 
   \lilypond{Etoiles_filantes-1}
 
diff --git a/songs/Les_Ogres_de_Barback/Rue_du_temps.sg b/songs/Les_Ogres_de_Barback/Rue_du_temps.sg
index 91b2dc61..5ac68001 100644
--- a/songs/Les_Ogres_de_Barback/Rue_du_temps.sg
+++ b/songs/Les_Ogres_de_Barback/Rue_du_temps.sg
@@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Rue du temps}
-  [by={Les Ogres de Barback},cov={Croc-noces},album={Croc noces},%
+  [by={Les Ogres de Barback},cov={croc-noces},album={Croc noces},%
   url={http://www.lesogres.com}]
 
   \cover
diff --git a/songs/Les_Ogres_de_Barback/rue-du-temps.jpg b/songs/Les_Ogres_de_Barback/rue-du-temps.jpg
index c86a4406..30594dca 100644
Binary files a/songs/Les_Ogres_de_Barback/rue-du-temps.jpg and b/songs/Les_Ogres_de_Barback/rue-du-temps.jpg differ
diff --git a/songs/Les_Vieilles_Valises/Emilie.sg b/songs/Les_Vieilles_Valises/Emilie.sg
index 8f2255ba..f84accad 100644
--- a/songs/Les_Vieilles_Valises/Emilie.sg
+++ b/songs/Les_Vieilles_Valises/Emilie.sg
@@ -1,8 +1,9 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Émilie}
-  [by={Les Vieilles Valises}]
+  [by={Les Vieilles Valises},cov={on-verra-bien},album={On verra bien{\dots}}]
 
+  \cover
   \gtab{Am}{X02210}
   \gtab{G}{320003}
   \gtab{Dm}{XX0231}
diff --git a/songs/Les_Wriggles/petit_bonhomme.sg b/songs/Les_Wriggles/petit_bonhomme.sg
index b8db051d..1eff3162 100644
--- a/songs/Les_Wriggles/petit_bonhomme.sg
+++ b/songs/Les_Wriggles/petit_bonhomme.sg
@@ -68,7 +68,7 @@
   \begin{repeatedchords}
     \begin{chorus}
       Rien que des petits morceaux de \[D]peur
-      Que l'on t'a gentiment don\[Em]né
+      Que l'on t'a gentiment don\[Em]nés
       Des limailles, des copeaux de ter\[D]reur
       Qui paralysent la pen\[Em]sée
     \end{chorus}
@@ -118,7 +118,7 @@
     \begin{verse*}
       Y'a personne d'autre que moi sur \[C]Terre
       Le jour de ton enterre\[D]ment
-      A franchir la grille du cime\[B]tière
+      À franchir la grille du cime\[B]tière
       Vois, tous tes copains sont a\[Em]bsents
     \end{verse*}
 
diff --git a/songs/Lylloo/Ma_soiree_msn.sg b/songs/Lylloo/Ma_soiree_msn.sg
index bbcaad4c..470b2119 100644
--- a/songs/Lylloo/Ma_soiree_msn.sg
+++ b/songs/Lylloo/Ma_soiree_msn.sg
@@ -1,10 +1,10 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Ma soirée MSN}
-  [by={Lylloo}]
+  [by={Lylloo},cov={lol_com},album={lol.com}]
 
-  \capo{2}
   \cover
+  \capo{2}
   \gtab{Em}{022000}
   \gtab{C}{X32010}
   \gtab{G}{320003}
diff --git a/songs/M/La_seine.sg b/songs/M/La_seine.sg
index 907e58c7..0ec4347f 100644
--- a/songs/M/La_seine.sg
+++ b/songs/M/La_seine.sg
@@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{La seine}
-  [by={M},cov={La-seine},album={La seine}]
+  [by={M},cov={la-seine},album={La seine}]
 
   \cover
   \capo{5}
diff --git a/songs/Manu_Chao/clandestino.jpg b/songs/Manu_Chao/clandestino.jpg
index 3518b6a0..be1f52b4 100644
Binary files a/songs/Manu_Chao/clandestino.jpg and b/songs/Manu_Chao/clandestino.jpg differ
diff --git a/songs/Marie_Laforet/Ivan_Boris_et_moi.sg b/songs/Marie_Laforet/Ivan_Boris_et_moi.sg
index e9ee0922..5bb1f9fb 100644
--- a/songs/Marie_Laforet/Ivan_Boris_et_moi.sg
+++ b/songs/Marie_Laforet/Ivan_Boris_et_moi.sg
@@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Ivan, Boris et moi}
-  [by={Marie Laforêt},cov={succes},album={Succès}]
+  [by={Marie Laforêt},cov={les_succes},album={Succès}]
 
   \cover
   \gtab{Gm}{3:022000}
diff --git a/songs/Philippe_Chatel/La_compagnie_des_lapins_bleus.sg b/songs/Philippe_Chatel/La_compagnie_des_lapins_bleus.sg
index 7601e700..d0ccacd5 100644
--- a/songs/Philippe_Chatel/La_compagnie_des_lapins_bleus.sg
+++ b/songs/Philippe_Chatel/La_compagnie_des_lapins_bleus.sg
@@ -5,35 +5,37 @@
 
   \cover
   \gtab{F}{1:022100}
+  \gtab{Gm}{3:022000}
+  \gtab{C}{3:X02220}
   \gtab{D7}{XX0212}
-  \gtab{B&}{1:X02220}
-  \gtab{C}{X32010}
 
   \begin{verse}
     \[F]{C'est} nous la compagnie des lapins bleus
-    Aux oreilles tendues et aux yeux mali\[D7]cieux
-    Notre \[B&]fleuve préféré, c'est le Da\[C]nube
+    Aux oreilles tendues et aux yeux mali\[Gm]cieux
+    Notre fleuve préféré, c'est le Da\[C]nube
     Mais no\[F]tre problème inso\[D7]luble
-    \[B&]C'est qu'on devient tout \[C]rouge
+    \[Gm]C'est qu'on devient tout \[C]rouge
     Quand on attrape un \[F]rhume
   \end{verse}
 
-  \begin{verse}
-    On se cache tous les jours dans des mouchoirs
-    À carreaux le matin et à rayures le soir
-    Notre ennemi mortel, c'est l'hiver
-    Mais notre ami, c'est le soleil
-    On redevient tout bleu
-    Quand il brille dans le ciel
-  \end{verse}
+  \begin{repeatedchords}
+    \begin{verse}
+      \[F]On se cache tous les jours dans des mouchoirs
+      À carreaux le matin et à rayures le \[Gm]soir
+      Notre ennemi mortel, c'est l'hi\[C]ver
+      Mais \[F]notre ami, c'est le so\[D7]leil
+      \[Gm]On redevient tout \[C]bleu
+      Quand il brille dans le \[F]ciel
+    \end{verse}
 
-  \begin{verse}
-    C'est nous la compagnie des lapins bleus
-    Aux oreilles tendues et aux yeux malicieux
-    Mais que viennent la pluie et l'orage
-    Notre bonheur fait naufrage
-    Quand les lapins bleus sont rouges
-    Rien ne va plus dans la page
-  \end{verse}
+    \begin{verse}
+      \[F]{C'est} nous la compagnie des lapins bleus
+      Aux oreilles tendues et aux yeux mali\[Gm]cieux
+      Mais que viennent la pluie et l'o\[C]rage
+      No\[F]tre bonheur fait nau\[D7]frage
+      Quand \[Gm]les lapins bleus sont \[C]rouges
+      Rien ne va plus dans la \[F]page
+    \end{verse}
+  \end{repeatedchords}
 
 \endsong
diff --git a/songs/Razorlight/America.sg b/songs/Razorlight/America.sg
index 2e8709f8..698dfb59 100644
--- a/songs/Razorlight/America.sg
+++ b/songs/Razorlight/America.sg
@@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{America}
-  [by={Razorlight},cov={Razorlight},album={Razorlight}]
+  [by={Razorlight},cov={razorlight},album={razorlight}]
 
   \cover
   \gtab{G}{320003}
diff --git a/songs/Sheepbox/Devil_s_way.sg b/songs/Sheepbox/Devil_s_way.sg
index c3bf4daf..6be1f8d2 100644
--- a/songs/Sheepbox/Devil_s_way.sg
+++ b/songs/Sheepbox/Devil_s_way.sg
@@ -3,8 +3,6 @@
 \beginsong{Devil's Way}
   [by={Sheepbox},cov={sheepbox},album={Sheepbox}]
 
-  \cover
-
   % verse: 1.&.2.&.3.&.4.&
   % D D UD
   % Em Asus2
diff --git a/songs/The_Beatles/Hey_Jude.sg b/songs/The_Beatles/Hey_Jude.sg
index 16097afe..4913e8bc 100644
--- a/songs/The_Beatles/Hey_Jude.sg
+++ b/songs/The_Beatles/Hey_Jude.sg
@@ -10,7 +10,7 @@
   \gtab{B&}{1:X02220}
   \gtab{F7}{1:020100}
   \gtab{Gm}{3:022000}
-
+  \gtab{E&}{6:X02220}
 
   \begin{verse}
     Hey \[F]Jude, don't make it \[C]bad
@@ -19,41 +19,50 @@
     Then you can \[C7]start to make it \[F]better
   \end{verse}
 
-  \begin{verse}
-    Hey Jude, don't be afraid
-    You were made to go out and get her
-    The minute you let her under your skin
-    Then you begin to make it better
-  \end{verse}
+  \begin{repeatedchords}
+    \begin{verse}
+      Hey \[F]Jude, don't be a\[C]fraid
+      You were \[C7]made to go out and \[F]get her
+      The \[B&]minute you let her under your \[F]skin
+      Then you be\[C7]gin to make it \[F]better
+    \end{verse}
+  \end{repeatedchords}
 
-  \begin{verse}
+  \begin{chorus}
     \[F7]And anytime you feel the \[B&]pain, hey Jude, re\[Gm]frain
     Don't carry the \[C7]world upon your \[F]shoulders
     \[F7]For well you know that it's a \[B&]fool who plays it \[Gm]cool
     By making his \[C7]world a little \[F]colder
     Da da \[F7]da da, \[C7]da da da da da da
-  \end{verse}
+  \end{chorus}
 
-  \begin{verse}
-    Hey Jude, don't let me down
-    You have found her, now go and get her
-    Remember to let her into your heart
-    Then you can start to make it better
-  \end{verse}
+  \begin{repeatedchords}
+    \begin{verse}
+      Hey \[F]Jude, don't let me \[C]down
+      You have \[C7]found her, now go and \[F]get her
+      Re\[B&]member to let her into your \[F]heart
+      Then you can \[C7]start to make it \[F]better
+    \end{verse}
 
-  \begin{verse}
-    So let it out and let it in, hey Jude, begin
-    You're waiting for someone to perform with
-    And don't you know that it's just you, hey Jude, you'll do
-    The movement you need is on your shoulder
-  \end{verse}
+    \begin{chorus}
+      \[F7]So let it out and let it \[B&]in, hey Jude, be\[Gm]gin
+      You're waiting for \[C7]someone to per\[F]form with
+      \[F7]And don't you know that it's just \[B&]you, hey Jude, you'll \[Gm]do
+      The movement you \[C7]need is on your \[F]shoulder
+    \end{chorus}
 
-  \begin{verse}
-    Hey Jude, don't make it bad
-    Take a sad song and make it better
-    Remember to let her under your skin
-    Then you'll begin to make it
-    Better better better better better better, oh
-  \end{verse}
+    \begin{verse}
+      Hey \[F]Jude, don't make it \[C]bad
+      Take a \[C7]sad song and make it \[F]better
+      Re\[B&]member to let her under your \[F]skin
+      Then you'll be\[C7]gin to make it \[F]better, better, better, better, better, better, oh
+    \end{verse}
+  \end{repeatedchords}
+
+  \begin{bridge}
+    \[F]La la la, \[E&]la la la la
+    \[B&]La la la la
+    Hey \[F]Jude
+  \end{bridge}
 
 \endsong
diff --git a/songs/The_Beatles/Let_it_be.sg b/songs/The_Beatles/Let_it_be.sg
index c7251b1b..180946ab 100644
--- a/songs/The_Beatles/Let_it_be.sg
+++ b/songs/The_Beatles/Let_it_be.sg
@@ -9,7 +9,7 @@
   \gtab{G}{320003}
   \gtab{F}{1:022100}
   \gtab*{F*}{8:X02220}
-  \gtab*{Em*}{7:X02220}
+  \gtab*{E*}{7:X02220}
   \gtab*{D*}{5:X02220}
   \gtab*{C*}{3:X02220}
 
diff --git a/songs/The_Beautiful_Girls/La_Mar.sg b/songs/The_Beautiful_Girls/La_Mar.sg
index 8c8c41ca..939d6e02 100644
--- a/songs/The_Beautiful_Girls/La_Mar.sg
+++ b/songs/The_Beautiful_Girls/La_Mar.sg
@@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{La mar}
-  [by={The Beautiful Girls},cov={Learn-Yourself},album={Learn yourself}]
+  [by={The Beautiful Girls},cov={learn-yourself},album={Learn yourself}]
 
   \cover
   \gtab{E}{022100}
diff --git a/songs/Traditionnel/Chevaliers_de_la_table_ronde.sg b/songs/Traditionnel/Chevaliers_de_la_table_ronde.sg
index 2896d4e1..77dfa869 100644
--- a/songs/Traditionnel/Chevaliers_de_la_table_ronde.sg
+++ b/songs/Traditionnel/Chevaliers_de_la_table_ronde.sg
@@ -1,8 +1,9 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Chevaliers de la table ronde}
-  [by={Traditionnel}]
+  [by={Traditionnel},cov={traditionnel},album={France}]
 
+  \cover
   \gtab{C}{X32010}
   \gtab{G7}{320001}
   \gtab{F}{1:022100}
diff --git a/songs/Traditionnel/L_homme_de_cromagnon.sg b/songs/Traditionnel/L_homme_de_cromagnon.sg
index 54e57d28..6a52f361 100644
--- a/songs/Traditionnel/L_homme_de_cromagnon.sg
+++ b/songs/Traditionnel/L_homme_de_cromagnon.sg
@@ -1,8 +1,9 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{L'homme de Cro-Magnon}
-  [by={Traditionel}]
+  [by={Traditionnel},cov={traditionnel},album={France}]
 
+  \cover
   \gtab{C}{X32010}
   \gtab{G7}{320001}
   \gtab{G}{320003}
diff --git a/songs/Traditionnel/La_cucaracha.sg b/songs/Traditionnel/La_cucaracha.sg
index d340a3bb..03d44cf8 100644
--- a/songs/Traditionnel/La_cucaracha.sg
+++ b/songs/Traditionnel/La_cucaracha.sg
@@ -1,8 +1,9 @@
 \selectlanguage{spanish}
 \songcolumns{2}
 \beginsong{La Cucaracha}
-  [by={Traditionnel}]
+  [by={Traditionnel},cov={traditionnel},album={Espagne}]
 
+  \cover
   \gtab{C}{X32010}
   \gtab{G}{320003}
 
diff --git a/songs/Traditionnel/V_la_l_bon_vent.sg b/songs/Traditionnel/V_la_l_bon_vent.sg
index b8744a0d..66958420 100644
--- a/songs/Traditionnel/V_la_l_bon_vent.sg
+++ b/songs/Traditionnel/V_la_l_bon_vent.sg
@@ -1,8 +1,9 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{V'la l'bon vent}
-  [by={Traditionnel}]
+  [by={Traditionnel},cov={traditionnel},album={France}]
 
+  \cover
   \gtab{Am}{X02210}
   \gtab{C}{X32010}
   \gtab{E7}{020100}
diff --git a/songs/Traditionnel/Vent_frais.sg b/songs/Traditionnel/Vent_frais.sg
index f6b94567..36584ad7 100644
--- a/songs/Traditionnel/Vent_frais.sg
+++ b/songs/Traditionnel/Vent_frais.sg
@@ -1,8 +1,9 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Vent frais}
-  [by={Traditionnel}]
+  [by={Traditionnel},cov={traditionnel},album={France}]
 
+  \cover
   \gtab{Dm}{XX0231}
   \gtab{Am}{X02210}
 
diff --git a/songs/Tri_Yann/La_jument_de_Michao.sg b/songs/Tri_Yann/La_jument_de_Michao.sg
index 93ff32e9..48805484 100644
--- a/songs/Tri_Yann/La_jument_de_Michao.sg
+++ b/songs/Tri_Yann/La_jument_de_Michao.sg
@@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{La jument de Michao}
-  [by={Tri Yann},cov={la-decouverte-ou-l-ignorance},album={Le meilleur de Tri Yann}]
+  [by={Tri Yann},cov={le-meilleur-de-tri-yann},album={Le meilleur de Tri Yann}]
 
   \cover
   \gtab{Am}{X02210}
diff --git a/songs/Tri_Yann/Les_filles_de_Redon.sg b/songs/Tri_Yann/Les_filles_de_Redon.sg
index b142ecb7..e4119dfd 100644
--- a/songs/Tri_Yann/Les_filles_de_Redon.sg
+++ b/songs/Tri_Yann/Les_filles_de_Redon.sg
@@ -3,6 +3,7 @@
 \beginsong{Les filles de Redon}
   [by={Tri Yann},cov={le-meilleur-de-tri-yann},album={Le meilleur de Tri Yann}]
 
+  \cover
   \capo{3}
   \gtab{G}{320003}
   \gtab{Em}{022000}
diff --git a/songs/Vincent_Delerm/La_natation_synchronisee.sg b/songs/Vincent_Delerm/La_natation_synchronisee.sg
index 29433e1c..4b6f1623 100644
--- a/songs/Vincent_Delerm/La_natation_synchronisee.sg
+++ b/songs/Vincent_Delerm/La_natation_synchronisee.sg
@@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{1}
 \beginsong{La natation synchronisée}
-  [by={Vincent Delerm},cov={Kensington-Square},album={Kensington Square}]
+  [by={Vincent Delerm},cov={kensington-square},album={Kensington Square}]
 
   \cover
   \gtab{E}{022100}
diff --git a/songs/coluche/sois_faineant.sg b/songs/coluche/sois_faineant.sg
index b81cd155..a9f0e980 100644
--- a/songs/coluche/sois_faineant.sg
+++ b/songs/coluche/sois_faineant.sg
@@ -30,7 +30,7 @@
       \[D]Plutôt que d'apprendre à l'école
       Baise et collectionne les véroles
       La médecine fait quelques pro\[A]grès
-      Tandis qu'a gagner du ba\[G]gage
+      Tandis qu'à gagner du ba\[G]gage
       Tu n'aboutirais qu'au chô\[D]mage
       Où déjà se sont entas\[A]sés
       Ceux qu'ont cru \[G]en la socié\[D]té