John Mayer - Something Like Olivia tab

I noticed there were two tabs seperate for main song and solo. I used these to learn it 
and it sounds great so thought I'd put them together to help you folks out.

Verse 1,2,3 (also when he sings "Something like Olivia" 4 times)
         G         C/E
e------------------x---------------------|
b--------3---------5---------------------|
g--------4/5-------5---------------------|
d--------5---------5---------------------|
a--------x---------5/7-------------------|
e--------3-------------------------------|

Chorus

        D/F#        C/E          G
e--------x-----------x---------------------|
b--------7-----------5-----------3---------|
g--------7-----------5-----------4/5-------|
d--------7-----------5-----------5---------|
a--------7/9---------5/7---------x---------|
e--------------------------------3---------|

Solo

[ Tab from: http://www.guitaretab.com/j/john-mayer/339980.html ]
e|------------------------------------------------------------------------|
B|--10b(12)--10--8\---3------------------10b(12)--10--8-----8b(10)----8\--|
G|--------------------5----------------9----------------(9)--------9------|
D|--------------------5---7------7/9--------------------------------------|
A|---------------------------10-------------------------------------------|
E|------------------------------------------------------------------------|
  1:20                                 1:27
e|-3------------3------------------------------10-------------------------|
B|-5p3---3-3------6p5p3----------------10b(12)----10b(12)-10--9b(11)-8-8--|
G|-----5---3h4----------5-3h4-3h4-------------------------------------9-9-|
D|------------------------------------------------------------------------|
A|------------------------------------------------------------------------|
E|------------------------------------------------------------------------|
  1:32
e|-----------------------------------||
B|-9b(11)-8--------------------------||
G|-----------5b(7)r-3h5----(0)-------||
D|----------------------5---5--------||
A|-----------------------------------||
E|-----------------------------------||



Outro:

        D/F#        C/E
e--------x-----------x------------|
b--------7-----------5------------|
g--------7-----------5------------| x2 then G
d--------7-----------5------------|
a--------7/9---------5/7----------|
e---------------------------------|