Just finished developing the second test roll, all photos have come out perfect so it was the bulk cassette leaking light.
I have oiled the camera for the canon cough problem.
The mechanism arm that stops the lens down to working aperture when taking a photo is actually getting locked as I can't move it to its home position by hand. As this just means i have to advance the film before metering the next subject and it has no effect on the taking of the photo i will just leave it for now