Janes Addiction - Idiot's Rule Bass

IDIOTS RULE (Btab) from Jane's Addiction's album NOTHING'S SHOCKING
        This is my first attempt at tabbing something and sending it
in so bare with me.  If you have any suggestions, criticisms,
(guitar or bass)(not already in the OLGA) for any Chili Peppers, 
Jane's Addiction, Porno for Pyros and especially Deconstruction 
please send them to me (put them on OLGA also).

RIFF A (repeat numerous times until...)

(brackets indicate one bar of music) Fill 1    Fill 2   
G----[-----5-][-------][-----5-][--- (--5-)    (-5-5)] 
D----[---7---][7--5-4-][---5---][--- (5---) or (5-5-)] 
A----[5------][-------][3------][--- (----)    (----)] 
E----[-------][-------][-------][3-- (----)    (----)] 
Use Fill 1 when Perry sings and Fill 2 in the intro and
when Dave is soloing.

(1:40 on the CD...)
RIFF B  (play 4x)
                           Fill 2
G----[------5-----][------ (-5-5-)]
D----[---7-----7--][5----- (5-5--)]
A----[5-----------][---3-- (-----)]
E----[------------][------ (-----)]

(directly after that...)
RIFF C  (play 2x)

G----[------5----][------5-----]
D----[---7-----7-][---5-----5--]
A----[5----------][3-----------]
E----[-----------][------------]

(return to RIFF A, sometimes using FILL 1 and)
(sometimes using FILL 2.  Play till end...   )
END

G----[-------------]
D----[---7---------]
A----[5------------]
E----[-------------]