Taylor Swift — Umbrella (ver 2) Chords

So I tabbed this out myself and it's from the video
http://www.youtube.com/watch?v=GdZ9dTIYujo&feature=related
on youtube.
Please comment if there is anything wrong. 
I know it's not the whole song, but I have never heard her sing the whole thing, so enjoy. =]
If anyone hears the whole song, please leave a comment!

     G  Em7 Cadd9 Dsus4
e|———3———3———3————3——|
B|———3———3———3————3——|
G|———0———0———0————2——|
D|———0———0———2————0——|
A|———2———2———3————x——|
E|———3———2———0————x——|

CAPO ON 5

INTRO

Cadd9  G  Dsus4 Em7 (x2)

[CHORUS] 
Cadd9
When the sun shines 
                  G
We'll shine together 
                         Dsus4
Told you I'll be here forever 
                            Em
Said I'll always be your friend 

Took an oath 
                            Cadd9
I'mma stick it out 'till the end
                                  G
Now that it's raining more than ever 
                               Dsus4
Know that we still have each other 
                          Em
You can stand under my Umbrella 
                           Cadd9
You can stand under my Umbrella 
                 G
(Ella ella eh eh eh) 
              Dsus4
Under my umbrella 
                 Em Cadd9
(ella ella eh eh eh) 

[Verse]

Cadd9
You have my heart
                  G
We'll never be world's apart
              Dsus4
May be in magazine
                 Em
But you'll still be my star
            Cadd9
Baby cause in the dark
               G
You can't see shiny cars
                 Dsus4
That's when you need me there
             Em
With you I'll always share