Just recently went through all the same stuff but a bit more extensive.
can be a pain.
looks good though....need to post some pictures of the new quarter patch installed.
check out the link below to my build thread if you want to see what I did on mine.