Metallica - Broken Beat And Scarred Chords & Tabs

This is what I've made out so far, or at least the most "difficult" parts. (It's
all in E standard)

Pre Verse melody thinger (start at 00:18)

I-------------------------------|
I-------------------------------|
I-------------------------------|
I------/7-----------------------|
I------------8-7-5-7-8-7--------|
I----0--------------------------|

And then the other pre verse riff (stars at 00:40)

I-----------------------------------|
I-----------------------------------|
I-----------------------------------|
I--------/7-------------------------|
I--2-2----------8-7-5---------------|
I--0-0-0----------------------------|

And then the OTHER pre verse riff (starts at 1:00)

I-----------------------------------------------------------------|
I-----------------------------------------------------------------|
I-----------------------------------------------------------------|
I-----------------------------------------------------------------|
I-----------------------------------------------------------------|
I-15-17-15-14--12--12-12-12-12--12--12-12-12-12--12-12-12-12--12--|
                   PM------         PM------     PM---------------|
[ Tab from: https://www.guitartabs.cc/tabs/m/metallica/broken_beat_and_scarred_tab.html ]
I-----------------I---------------|
I-----------------I---------------|
I-----------------I---------------|
I-----------------I---------------|
I-----------------I---------------|
I-12-12-12-12--12-I-15----15--15--| (Repeat) (last time, omit last section)
  PM------------------------------|

(these palm mutes are triplet figures)


And finally, the VERSE riff (Will start with the pick-up)

I-----------I----------------------------------------------------------------|
I-----------I----------------------------------------------------------------|
I-----------I----------------------------------------------------------------|
I-----------I----------------------------------------------------------------|
I-----------I----------2---------2--2--------2--2---------2--2---------------|
I-3----3-3--I-3-5-3-2--0---0-0-0-0--0--0--0--0--0---0--0--0--0---------------|
       PM-                 PM---       PM--         PM-----------------------|

I------------------------------|
I------------------------------|
I------------------------------|
I------------------------------|
I-2----------------------------|
I-0--0--0--3--3--3--3----------|
     PM------------------------|

Please feel free to add on and fix. Don't forget to give me credit!