DEAD KENNEDYS - "when ya get drafted" Tablature

ass tab for "When ya get Drafted" by the Dead Kennedys
from "Fresh Fruit for Rotting Vegetables"

I worked this out from someone's guitar tab, but I can't remember
who's, I think it was Rambozo's, but whoever it was most of the credit
must go to them. Thanks, Nick

riff 1 intro only
G------------------- G-------------------
D-------------2-222- x3 D----------4-44-444-
A-4-442-224-44------ A-2-22-222----------
E------------------- E-------------------

riff 2
G----------------------------------
D-------------------------4-44-444- x2
A-2-22-222-------------------------
E---------2-22-2225-55-555---------

riff 3
G--------------------------------
D--------------------------------
A-2-22-222-----------------------
E---------2-2-2225-55-5550-0-4-5-

riff 4
G---------------------------------
D---------------------------------
A-2-22-222---------------4-44-444-
E---------2-22-2225-55-55---------

riff 5
G---------------------------------
D--------------------------------- x2
A---------------------------------
E-2-2-3-0-2-2-3-0-2-2-3-0-2-2-2-2-
*
riff 1 x2

riff 2 x2
riff 3
riff 4

riff 5 x2
riff 5 but played on the A string
riff 5 but only up to the note where the * is

riff 6 (solo)
G--------------------------------------------------------55555555
D-4444444444444444777777776666666644444444444444477777777--------
A----------------------------------------------------------------
E----------------------------------------------------------------
These are all elevens
444444444444444477777777666666664444444444444444777777771111111111111111
------------------------------------------------------------------------
------------------------------------------------------------------------
------------------------------------------------------------------------

riff 5

outro
G-------------------------------------------
D-------------------------------------------
A-------------------------------------------
E-2-2-3-0-2-2-3-0-2-2-3-0-2---------222-3-0-

This mostly right, I'm not too sure about the timing on the solo bit
i think it might be different from the rest of the song. I've tried to tab
out the rhythm correctly, notes together (-55-) are 16ths, notes a space
apart (-5-5) are 8ths etc, but it might be wrong in places.
Nick

P.S.
The guitar solo goes like this
E-------------------------------------------------
B----20-19----18----17-------20-19----18----17___-
G-17-------19----18----17-17-------19----18-------

E----20-19----18----17------ 20-19----18----20___-
B-18-------20----19----18-18-------20----19-------
G-------------------------------------------------

I bet no-one finds it in here.