Thanks heaps Elliott for pointing me in the right direction. My lens now focuses great
it was slightly different for my lens, there was a stopper screw which could not be adjusted but the pieces were held in place with tape. I focused on infinity, removed the tape, adjusted the focus until a far-away object was in focus, then replaced the tape.
I only wish I read your post before I tried it myself... I opened up the lens from the back to see whether I could figure it out, and now the aperture ring doesn't "click"... It still works though. Not a huge deal but it was fun seeing how it works lol.
Cheers,
Daniel