City And Colour - The Grand Optimist chords

I had just noticed that the other tabs were just a wee bit off.
So I made it correct as possible. This is derived from watching him play the song in 
several versions, but predominantly this one.
http://www.youtube.com/watch?v=k0XCA9_6lIA&feature=related

Standard tuning
Capo 2

For the C and the Am, he throws his pinky onto the fourth fret of the G string.
Cmaj7  - x32410
AmAdd9 - x02410

And he specifically does the C to Am walk down, so he uses the G/B
G/B      - X20030

Intro: C G/B Am C G/B Am

Verse:

C          G/B            Am
I fear I'm dying of complications

      C              G/B                    Am
Complications due to things that I've left undone

            C                  G/B
That all my debts will be left unpaid

            Am
Feel like a cripple without a cane

           C               G/B
I'm like a jack of all trades

                  Am
Who's a master of none
[ Tab from: http://www.guitaretab.com/c/city-and-colour/299282.html ]
Intro twice, on the second time he throws in
a little riff. Dallas plays it that way.
e|----0---0-0----0------------0---0-0----0---0-----|
B|----0h1-1-1----3------------1---1-1----1---1-----|
G|----4---4-4----0-----5---7--4---4-4----4---4-----|
D|----2---2-2----0--5/7-7/9---2---2-2----2---2-----|
A|--3-3---3-3----2------------0---0-0--0-0---0-2-3-|
E|-------------3-----------------------------------|


Verse 2:

C               G/B
Then there's my father

Am
He's always looking on the bright side

       C            G/B                       Am
Saying things like "son life just ain't that hard"

          C            G/B
He is the grand optimist

         Am
I am the world's poor pessimist

             C                G/B
You give him buttons sometimes

                   Am
And he will escape unscarred


Pre-Chorus/Chorus:

G                       Am
I guess I take after my mother    x2


I used to be quite resilient
Gain no strength from counting the beads on a rosary
Now the wound has begun to turn
Another lesson that has gone unlearned
But this is not a cry for pitty or for sympathy

I guess I take after my mother