RADIOHEAD - "street spirit 2" Tablature

I don't think the other tabs of this song are completely correct so this is my version. I've also added what I think are the lyrics.

Artist: Radiohead.
Song: Street Sprit (Fade Out).
Tabbed by: John Garry.

Riff 1:
:-----0-------0-------0-----------
:---------3-------1-------0-------
:-------2---2---2---2---2---2---2-
:---2-------------------------2---
:-0-------------------------------
:---------------------------------

Riff 2:
:-----0-------0-------0-----------
:---------3-------1-------0-------
:-------0---0---0---0---0---0---0-
:---2-------------------------2---
:---------------------------------
:-0-------------------------------

Riff 3:
:-----0-------0-------0-----------
:---------3-------1-------0-------
:-------0---0---0---0---0---0---0-
:---2-------------------------2---
:-3-------------------------------
:---------------------------------

Intro:
Riff 1 (x4)

Verse 1:
(Riff 1) (Riff 1)
Rows of thousands are bearing down on me,
(Riff 1) (Riff 1)
I can feel their blue hands touching me,
(Riff 2)
All these things into position,
(Riff 2) (Riff 1) x2
All these things will one day swallow (whole),

Chrous:
(Riff 3) (Riff 2) (Riff 1) x2
Faaaaaade ooouuuuut agaaaaaiiiiiiinnnn. X2

(At the end of the first chrous, after the second Riff 2, you go straight into the second verse)

Verse 2:
This machine will, will not communicate,
These thoughts from the strain i am under,
Be a world child, form a circle,
Before we all, go under

Chrous:

(In the Harmony part play this)

(Riff 3) (Riff 2) (Riff 1) (Riff 1)
(Riff 3) (Riff 2)

Verse 3:
Cracked eggs, dead birds, scream as they fight for life,
I can feel death, can see it's beady eyes,
All these things into position,
All these things will one day swallow (whole),

Chrous:

(In this Harmony part play this)

(Riff 3) (Riff 2) (Riff 1) (Riff 1)
(Riff 3) (Riff 2) (Riff 1) (Riff 1)

End piece(Whatever ya wanna call it):
(Riff 3) (Riff 2) (Riff 1) (Riff 1)
Immeeeeeerse your soouuul in looooooovvvvvve
(Riff 3) (Riff 2) (Riff 1)
Immeeeeeerse your soouuul in looovvve