2 questions re this file

[Peter Teeson]

Hi:

1. How can I break the composer text so it appears like this on the score:
                                        Music: Thomas 'Fats' Waller 
                                                     & Harry Brooks

 2. How can I make the last word of VerseTwo appear in the 2nd repeat (not in 
the 1st as happens now)
     Here is the pdf ----

Ain't Misbehavin v3.pdf
Description: Adobe PDF document

(NOTE: The console log is clean except for the ubiquitous barcheck issue 99!!)

TIA

Peter
-------------- here is the .ly file --------------------------------

\version "2.19.15"
\header {
  title = "Ain't Misbehavin'"
  poet = "Words: Andy Razal "
  composer = "Music: Thomas 'Fats' Waller & Harry Brooks"
  meter = "Slowly"
  tagline = \markup {
    \column {
      "LilyPond file by Peter Teeson, Toronto 2015/02/25"
    }
  }
}

\include "english.ly"  % English accidental names f = flat, s = sharp
#(set-global-staff-size 30)

melody = \relative c' {
        \key ef \major
        \time 2/2 
        \clef treble
        \repeat volta 2 { 
                r8 ef f ef d' d4. | r8 f, g f c'2 |
                r8 bf c bf ef ef4 d8 | f ef c  g~ g gf4 f8 |
                r8 ef f ef d' d4. | r8 f, g f c' c4 bf8 |
        }
        \alternative {
                { g1~ | g1 |}
                { g1~ | g2. r4}
         }
}

VerseOne = \lyricmode {
        \override Lyrics.LyricHyphen.minimum-distance = 1
        \set stanza = "#1. "
        No one to talk with, | all by my -- self,
        no one to walk with, but | I'm hap -- py on __ the shelf, |
        Ain't Mis -- be -- hav -- in' | I'm sav -- in' my love for |
        you __ |
}

VerseTwo = \lyricmode {
        \override Lyrics.LyricHyphen.minimum-distance = 1
        \set stanza = "#2. "
        I know for cer -- tain | the one I love, 
        I'm thru with flir -- tin' | it's just you I'm think -- in' of.
        Ain't Mis -- be -- hav -- in' | I'm sav -- in' my love for |
        you __ |
}

\score {
        <<      
                \new Voice = "one" { \melody }
                \new Lyrics \lyricsto "one" { \VerseOne }
                \new Lyrics \lyricsto "one" { \VerseTwo }
        >>
                \layout { }
                \midi { }
}