diff --git a/books/volume-2.sb b/books/volume-2.sb
index 906a4944..b4c5b0a2 100644
--- a/books/volume-2.sb
+++ b/books/volume-2.sb
@@ -162,7 +162,7 @@
     "simon_garfunkel/the_only_living_boy_in_new_york.sg",
     "steve_waring/la_baleine_bleue.sg",
     "system_of_a_down/roulette.sg",
-    "the_animals/the_house_of_rising_sun.sg",
+    "the_animals/house_of_the_rising_sun.sg",
     "the_beatles/let_it_be.sg",
     "the_beatles/octopus_garden.sg",
     "the_beatles/twist_and_shout.sg",
diff --git a/songs/georges_brassens/la_princesse_et_le_croque_notes.sg b/songs/georges_brassens/la_princesse_et_le_croque_notes.sg
new file mode 100644
index 00000000..0428a375
--- /dev/null
+++ b/songs/georges_brassens/la_princesse_et_le_croque_notes.sg
@@ -0,0 +1,77 @@
+\selectlanguage{french}
+\songcolumns{2}
+\beginsong{La princesse et le croque-notes}
+  [by={Georges Brassens},cover={mourir-pour-des-idees},album={Mourir pour des idées}]
+
+  \cover
+  \gtab{Am}{X02210}
+  \gtab{E}{022100}
+  \gtab{G}{320003}
+  \gtab{C}{X32010}
+  \gtab{F}{1:022100}
+  \gtab{E7}{020100}
+
+  \begin{verse}
+     \[Am]Jadis, au \[E]lieu du jar\[Am]din que voi\[E]ci,
+     \[Am]C’était la \[E]zone et tout \[Am]ce qui s’en\[E]suit,
+     \[Am]Des masu\[G]res, des tau\[C]dis inso\[G]lites,
+     \[C]Des ruines pas romai\[F]nes pour un \[E7]sou.
+     \[Am]Quant à la faune habi\[F]tant là-des\[E7]sous
+     \[Am]C’était la \[G]fine fleur, \[C]c’était l’é\[F]li-\[E7]i-\[Am]te.
+  \end{verse}
+
+  \begin{verse}  
+     La fine fleur, l’élite du pavé.
+     Des besogneux, des gueux, des réprouvés,
+     Des mendiants rivalisant de tares,
+     Des chevaux de retour, des propre’-à-rien,
+     Ainsi qu’un croque-notes, un musicien,
+     Une épave accrochée à sa guitare.
+  \end{verse}
+
+  \begin{verse}
+     Adoptée par ce beau monde attendri,
+     Une petite fée avait fleuri
+     Au milieu de toute cette bassesse.
+     Comme on l’avait trouvé’ près du ruisseau,
+     Abandonnée en un somptueux berceau,
+     A tout hasard on l’appelait “princesse”.
+  \end{verse}
+
+  \begin{verse}
+     Or, un soir, Dieu du ciel, protégez-nous!
+     La voilà qui monte sur les genoux
+     Du croque-notes et doucement soupire,
+     En rougissant quand même un petit peu :
+     C’est toi que j’aime et, si tu veux, tu peux
+     M’embrasser sur la bouche et même pire...
+  \end{verse}
+
+  \begin{verse}
+     Tout beau, princesse arrête un peu ton tir,
+     J’ai pas tell’ment l’étoffe du satyr’,
+     Tu as treize ans, j’en ai trente qui sonnent,
+     Gross’ différence et je ne suis pas chaud
+     Pour tâter d’la paille humid’ du cachot...
+     Mais, Croque-not’s, j’dirai rien à personne...
+  \end{verse}
+
+  \begin{verse}
+     N’insiste pas, fit-il d’un ton railleur,
+     D’abord, tu n’es pas mon genre, et d’ailleurs
+     Mon coeur est déjà pris par une grande...
+     Alors Princesse est partie en courant,
+     Alors Princesse est partie en pleurant,
+     Chagrine qu’on ait boudé son offrande.
+  \end{verse}
+
+  \begin{verse}
+     Y’a pas eu détournement de mineure,
+     Le croque-notes, au matin, de bonne heure,
+     A l’anglaise a filé dans la charrette
+     Des chiffonniers en grattant sa guitare.
+     Passant par là, quelques vingt ans plus tard,
+     Il a le sentiment qu’il le regrette.
+  \end{verse}
+
+\endsong
diff --git a/songs/georges_brassens/mourir-pour-des-idees.jpg b/songs/georges_brassens/mourir-pour-des-idees.jpg
new file mode 100644
index 00000000..a56c6c84
Binary files /dev/null and b/songs/georges_brassens/mourir-pour-des-idees.jpg differ
diff --git a/songs/johnny_cash/american-four.jpg b/songs/johnny_cash/american-four.jpg
new file mode 100644
index 00000000..1f45c717
Binary files /dev/null and b/songs/johnny_cash/american-four.jpg differ
diff --git a/songs/johnny_cash/hurt.sg b/songs/johnny_cash/hurt.sg
new file mode 100644
index 00000000..03017e74
--- /dev/null
+++ b/songs/johnny_cash/hurt.sg
@@ -0,0 +1,63 @@
+\selectlanguage{english}
+\songcolumns{2}
+\beginsong{Hurt}
+  [by={Johnny Cash},cover={american-four},album={American IV: The Man Comes Around}]
+
+  \cover
+  \gtab{Am}{X02210}
+  \gtab{C}{X32010}
+  \gtab{D}{XX0232}
+  \gtab{G}{320003}
+  \gtab{F}{1:022100}
+
+  \begin{verse*}
+    \musicnote{\nolyrics{ \[Am C D Am C D Am] }}
+  \end{verse*}
+
+  \begin{verse}
+    I \[C]hurt my\[D]self to\[Am]day
+    To \[C]see if \[D]I still \[Am]feel
+    I \[C]focus \[D]on the \[Am]pain
+    The \[C]only \[D]thing that's \[Am]real
+    The \[C]needle \[D]tears a \[Am]hole
+    The \[C]old fa\[D]miliar \[Am]sting
+    Try to \[C]kill it \[D]all a\[Am]way
+    But I re\[C]member \[D]every\[G]thing
+  \end{verse}
+
+  \begin{chorus}
+    \[Am]What have I be\[F]come
+    \[C] My sweetest \[G]friend
+    \[Am]Everyone I \[F]know goes a\[C]way
+    In the \[G]end
+    And \[Am]you could have it \[F]all
+    \[C]My empire of dirt
+    \[Am]I will let you \[F]down
+    \[C]I will make you \[Am]hurt
+  \end{chorus}
+
+  \begin{verse*}
+    \musicnote{\nolyrics{ \[C D Am C D Am] }}
+  \end{verse*}
+
+  \begin{verse}
+    I wear this crown of thorns
+    Upon my liar's chair
+    Full of broken thoughts
+    I cannot repair
+    Beneath the stains of time
+    The feelings disappear
+    You are someone else
+    I am still right here
+  \end{verse}
+
+  \musicnote{\Chorus}
+
+  \begin{bridge}
+    If I could start again
+    A million miles away
+    I would keep myself	
+    I would find a way
+  \end{bridge}
+
+\endsong
diff --git a/songs/johnny_cash/i_hung_my_head.sg b/songs/johnny_cash/i_hung_my_head.sg
new file mode 100644
index 00000000..2a783def
--- /dev/null
+++ b/songs/johnny_cash/i_hung_my_head.sg
@@ -0,0 +1,100 @@
+\selectlanguage{english}
+\songcolumns{2}
+\beginsong{I hung my head}
+  [by={Johnny Cash},cover={american-four},album={American IV: The Man Comes Around}]
+
+  \cover
+  \gtab{C}{X32010}
+  \gtab{F}{1:022100}
+  \gtab{Am}{X02210}
+  \gtab{Dm}{XX0231}
+  \gtab{G}{320003}
+
+  \begin{verse*}
+    \musicnote{\nolyrics{ \[C F C F C C] }}
+  \end{verse*}
+
+  \begin{verse}
+    \[C]Early one morning
+    With \[F]time to kill
+    I \[Am]borrowed Jebb's rifle
+    And \[F]sat on the hill
+    I \[C]saw a lone rider
+    \[F]Crossing the plain
+    I \[Am]drew a bead on him
+    To \[F]practice my aim
+    \[Dm]My brother's rifle
+    Went \[G]off in my hand
+    A shot rang out
+    \[C]Across the land
+    The \[F]horse, he kept running
+    The \[Am]rider was dead
+    I \[C]hung my head
+    I \[F]hung my head
+    \[C]
+  \end{verse}
+
+  \begin{verse}
+    I set off running
+    To wake from the dream
+    My brother's rifle
+    Went into the sheen
+    I kept on running
+    Into the south lands
+    That's where they found me
+    My head in my hands
+    The sheriff he asked me
+    Why had I run
+    And then it came to me
+    Just what I had done
+    And all for no reason
+    Just one piece of lead
+    I hung my head
+    I hung my head
+  \end{verse}
+
+  \begin{verse}
+    Here in the court house
+    The whole town was there
+    I see the judge
+    High up in his chair
+    "Explain to the court room
+    What went through your mind.
+    And we'll ask the jury
+    What verdict they find."
+    I felt the power
+    Of death over life
+    I orphaned his children
+    I widowed his wife
+    I begged their forgiveness
+    I wish I was dead
+    I hung my head
+    I hung my head
+  \end{verse}
+
+  \begin{verse}
+    Early one morning
+    With time to kill
+    I see the gallows
+    Up on a hill
+    And out in the distance
+    A trick of the brain
+    I see a lone rider
+    Crossing the plain
+    And he'd come to fetch me
+    To see what they'd done
+    And we'd ride together
+    To kingdom come
+    I prayed for god's mercy
+    For soon I'd be dead
+    I hung my head
+    I hung my head
+  \end{verse}
+
+  \begin{bridge}
+    I hung my head
+    I hung my head 
+    I hung my head
+    I hung my head 
+  \end{bridge}
+\endsong
diff --git a/songs/les_ogres_de_barback/rue_de_panam.sg b/songs/les_ogres_de_barback/rue_de_paname.sg
similarity index 100%
rename from songs/les_ogres_de_barback/rue_de_panam.sg
rename to songs/les_ogres_de_barback/rue_de_paname.sg
diff --git a/songs/michel_polnareff/goodbye_maryloo.sg b/songs/michel_polnareff/goodbye_marylou.sg
similarity index 98%
rename from songs/michel_polnareff/goodbye_maryloo.sg
rename to songs/michel_polnareff/goodbye_marylou.sg
index b63b75f9..4e2f03fd 100644
--- a/songs/michel_polnareff/goodbye_maryloo.sg
+++ b/songs/michel_polnareff/goodbye_marylou.sg
@@ -1,6 +1,6 @@
 \selectlanguage{french}
 \songcolumns{2}
-\beginsong{Goodbye Maryloo}
+\beginsong{Goodbye Marylou}
   [by={Michel Polnareff},cover={passe-present},album={Passé Présent }]
 
   \cover
diff --git a/songs/noir_desir/aux_sombres_heros_de_l_amer.sg b/songs/noir_desir/aux_sombres_heros_de_l_amer.sg
index 15143741..44146e6a 100644
--- a/songs/noir_desir/aux_sombres_heros_de_l_amer.sg
+++ b/songs/noir_desir/aux_sombres_heros_de_l_amer.sg
@@ -5,15 +5,15 @@
 
   \cover
   \gtab{Am}{X02210}
-  \gtab{F}{1:022100}
   \gtab{C}{X32010}
   \gtab{G}{320003}
+  \gtab{F}{1:022100}
   \gtab{Dm}{XX0231}
 
   \begin{verse}
-    \[Am]Aux sombres héros de l'a\[F]mer
-    Qui ont su traver\[C]ser
-    Les océ\[G]ans du \[F]vide
+    \[Am]Aux sombres héros de l'a\[C]mer
+    Qui ont su traver\[G]ser
+    Les océans du \[F]vide
   \end{verse}
 
   \begin{verse*}
@@ -23,7 +23,8 @@
   \end{verse*}
 
   \begin{chorus}
-    \[Am]Al\[C]ways \[Dm]lost in the \[F]sea \rep{2}
+    \[Am]Al\[C]ways \[G]lost in the \[F]sea
+    \[Am]Al\[C]ways \[Dm]lost in the \[F]sea
   \end{chorus}
 
   \begin{verse}
diff --git a/songs/renaud/le_gringalet.sg b/songs/renaud/le_gringalet.sg
new file mode 100644
index 00000000..5c0ec5e6
--- /dev/null
+++ b/songs/renaud/le_gringalet.sg
@@ -0,0 +1,77 @@
+\selectlanguage{french}
+\songcolumns{2}
+\beginsong{Le gringalet}
+  [by={Renaud},cover={amoureux-de-paname},album={Amoureux de Paname}]
+
+  \cover
+  \gtab{C}{X32010}
+  \gtab{G}{320003}
+  \gtab{G7}{320001}
+
+
+  \begin{verse}
+    \[C]C'était un gringalet
+    pas vraiment laid,
+    mais il était
+    né à Pa\[G]name,
+    \[G7]tous ceux qui l'connaissaient
+    y disaient
+    qu'y savait
+    causer aux \[C]dames.
+  \end{verse}
+
+  \begin{verse}
+    C'était pas un tocard,
+    un ringard,
+    Un traîne boul'vard,
+    On l'app'lait l'saint-bernard
+    Le Mozart
+    du Pont des Arts.
+  \end{verse}
+
+  \begin{verse}
+    C'était pas un dragueur,
+    un flambeur
+    de fin d'semaine,
+    il amenait nos p'tites sœurs
+    un quart d'heure
+    su'l'bord d'la Seine.
+  \end{verse}
+
+  \begin{verse}
+    Il avait pas eu d'père,
+    pas eu d'mère,
+    ni d'anniversaire,
+    il était né un soir,
+    rue Rochechouart,
+    près d'une poubelle.
+  \end{verse}
+
+  \begin{verse}
+    Il avait pas eu d'chance,
+    ni d'vacances,
+    dans son enfance,
+    mais quand fallait d'l'ambiance,
+    sa seule présence,
+    c'était Byzance.
+  \end{verse}
+
+  \begin{verse}
+    C'était un bon copain,
+    y méritait bien
+    cette chansonnette,
+    car il est mort de faim,
+    un beau matin,
+    rue d'la Roquette.
+  \end{verse}
+
+  \begin{verse}
+    Cette chanson se termine,
+    ça m'déprime,
+    c'est pas humain,
+    moi j'aime pas les chansons
+    où les héros
+    y meurent à la fin.
+  \end{verse}
+
+\endsong
diff --git a/songs/the_animals/the_house_of_rising_sun.sg b/songs/the_animals/house_of_the_rising_sun.sg
similarity index 100%
rename from songs/the_animals/the_house_of_rising_sun.sg
rename to songs/the_animals/house_of_the_rising_sun.sg
diff --git a/songs/the_beatles/yesterday.sg b/songs/the_beatles/yesterday.sg
index cd4fe333..385680d1 100644
--- a/songs/the_beatles/yesterday.sg
+++ b/songs/the_beatles/yesterday.sg
@@ -9,12 +9,13 @@
   \gtab{Am}{X02210}
   \gtab{F}{1:022100}
   \gtab{G7}{320001}
+  \gtab{D}{XX0232}
 
   \begin{verse}
     \[C]Yesterday
-    \[E7]All my troubles seemed so \[Am]far away
+    \[Bm] All my \[E7]troubles seemed so \[Am]far away \[G]
     \[F]Now it \[G7]seems as though they're \[C]here to stay
-    Oh, \[Am]I be\[F]lieve in \[C]yesterday
+    Oh, \[Am]I be\[D]lieve in \[F]yester\[C]day
   \end{verse}
 
   \begin{verse}
@@ -25,9 +26,9 @@
   \end{verse}
 
   \begin{chorus}
-    \[E7]Why she \[Am]had \[E7]to g\[Am]o
+    \[E7]Why she \[Am]had \[G]to g\[F]o
     I don't \[G7]know, she wouldn't \[C]say
-    \[E7]I said \[Am]some\[E7]thing \[Am]wrong
+    \[E7]I said \[Am]some\[G]thing \[F]wrong
     Now I \[G7]long for yester\[C]day
   \end{chorus}
 
@@ -40,4 +41,8 @@
 
   \musicnote{\Chorus, \Verse{} 3}
 
+  \begin{verse}
+  \[C]hmmm hmmm \[D7]hmmm hmmm \[F]hmmm hmmm \[C]hmmm
+  \end{verse}  
+
 \endsong
diff --git a/songs/the_mamas_and_the_papas/california_dream.sg b/songs/the_mamas_and_the_papas/california_dreamin.sg
similarity index 95%
rename from songs/the_mamas_and_the_papas/california_dream.sg
rename to songs/the_mamas_and_the_papas/california_dreamin.sg
index 4dd20e02..77576911 100644
--- a/songs/the_mamas_and_the_papas/california_dream.sg
+++ b/songs/the_mamas_and_the_papas/california_dreamin.sg
@@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
-\beginsong{California dream}
-  [by={The mamas\ and\ the\ papas},cover={california-dreamin},album={California dreamin}]
+\beginsong{California dreamin'}
+  [by={The mamas\ and\ the\ papas},cover={california-dreamin},album={California dreamin'}]
 
   \cover
   \capo{4}
diff --git a/songs/tracy_chapman/baby_can_i_hold_you.sg b/songs/tracy_chapman/baby_can_i_hold_you.sg
new file mode 100644
index 00000000..9fbec482
--- /dev/null
+++ b/songs/tracy_chapman/baby_can_i_hold_you.sg
@@ -0,0 +1,48 @@
+\selectlanguage{english}
+\songcolumns{2}
+\beginsong{Baby can I hold you}
+  [by={Tracy Chapman},cover={tracy-chapman},album={Tracy Chapman}]
+
+  \cover
+  \gtab{G}{320003}
+  \gtab*{Cadd9}{032030}
+  \gtab{Em}{022000}
+  \gtab*{Dsus4}{X00233}
+  \gtab{D}{XX0232}
+
+  \begin{verse}
+    Sor\[D]ry \[Dsus2] \[D]
+    Is \[A7sus4]all that \[A]you can't \[Em]say
+    \[A7sus4]Years gone \[A]by and \[D]still \[Dsus2] \[D]
+    \[A7sus4]Words don't \[A]come easi\[Em]ly
+    \[G]Like sorry like \[A7]sorry \[A7sus4] \[A7]
+  \end{verse}
+
+  \begin{verse}
+    Forgive me
+    Is all that you can't say
+    Years gone by and still
+    Words don't come easily
+    Like forgive me forgive me
+  \end{verse}
+
+  \begin{bridge}
+    But you can say \[D]baby \[Dsus2] \[D]
+    \[Em]Baby can I \[G]hold you to\[D]night \[Dsus2] \[D]
+    [Em]Maybe if I \[G]told you the \[Bm]right words
+    At the \[A]right time you'd be \[D]mine \[Dsus2] \[D]
+  \end{bridge}
+
+  \begin{verse*}
+    \musicnote{\nolyrics \[Em Fm G A]}
+  \end{verse*}
+
+  \begin{verse}
+    I love you
+    Is all that you can't say
+    Years gone by and still
+    Words don't come easily
+    Like I love you I love you
+  \end{verse}
+
+\endsong
diff --git a/songs/tracy_chapman/collection.jpg b/songs/tracy_chapman/collection.jpg
deleted file mode 100644
index ac0f8f69..00000000
Binary files a/songs/tracy_chapman/collection.jpg and /dev/null differ
diff --git a/songs/tracy_chapman/for_my_lover.sg b/songs/tracy_chapman/for_my_lover.sg
new file mode 100644
index 00000000..7ed446c9
--- /dev/null
+++ b/songs/tracy_chapman/for_my_lover.sg
@@ -0,0 +1,77 @@
+\selectlanguage{english}
+\songcolumns{2}
+\beginsong{For my lover}
+  [by={Tracy Chapman},cover={tracy-chapman},album={Tracy Chapman}]
+
+  \cover
+  \gtab{Em}{022000}
+  \gtab{G}{320003}
+  \gtab{D}{XX0232}
+  \gtab{A}{001110}
+  \gtab{C}{X32010}
+  \gtab*{Cmaj9}{3:X02120}
+
+  \begin{verse}
+    \[Em] Two weeks in a Vir\[G]ginia jail
+    \[D]For my lover \[A]for my lover
+    \[Em] Twenty thousand \[G]dollar bail
+    \[D]For my lover \[A]for my lover
+  \end{verse}
+
+  \begin{chorus}
+    \[C] And everybody thinks
+    \[A] That I'me the fool
+    \[D] But they don't get
+    Any \[C]love from you
+    \[Em] The things we won't do for \[A]love
+    I'd \[Em]climb a mountain if I had to
+    \[G] And risk my life so I could have 
+    \[D]You, you, you, you
+    \[A]You, you, you, you
+  \end{chorus}
+
+  \begin{verse}
+    Everyday I'm psychoanalyzed
+    For my lover for my lover
+    They dope me up and I tell them lies
+    For my lover for my lover
+  \end{verse}
+
+  \begin{verse*}
+    chorus
+  \end{verse*}
+
+  \begin{bridge}
+    \[Cmaj9] I follow my heart
+    \[Em] And leave my head to ponder
+    \[D] Deep in this love
+    No \[Cmaj9]man can shake
+    \[Cmaj9] I follow my heart
+    \[Em] And leave my mind to wonder	
+    \[D] Is this love worth
+    The \[Cmaj9]sacrifices I make 
+  \end{bridge}
+
+  \begin{verse}
+    Two weeks in a Virginia jail
+    For my lover for my lover
+    Twenty thousand dollar bail
+    For my lover for my lover
+  \end{verse}
+
+  \begin{verse*}
+    No chorus
+  \end{verse*}
+
+  \begin{verse}
+    Everyday I'm psychoanalyzed
+    For my lover for my lover
+    They dope me up and I tell them lies
+    For my lover for my lover
+  \end{verse}
+
+  \begin{verse*}
+    chorus
+  \end{verse*}
+
+\endsong
diff --git a/songs/tracy_chapman/talkin_about_the_revolution.sg b/songs/tracy_chapman/talkin_about_the_revolution.sg
index 42c1eb30..bbf001b6 100644
--- a/songs/tracy_chapman/talkin_about_the_revolution.sg
+++ b/songs/tracy_chapman/talkin_about_the_revolution.sg
@@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Talkin' about the revolution}
-  [by={Tracy Chapman},cover={collection},album={Collection}]
+  [by={Tracy Chapman},cover={tracy-chapman},album={Tracy Chapman}]
 
   \cover
   \gtab{G}{320003}
diff --git a/songs/tracy_chapman/tracy-chapman.jpg b/songs/tracy_chapman/tracy-chapman.jpg
new file mode 100644
index 00000000..1add91a6
Binary files /dev/null and b/songs/tracy_chapman/tracy-chapman.jpg differ