And I almost forgot; the oil leak, I think I have found where it is coming from. The only candidate is what appears to be a drain hole from the alternator cover.
But this isn't an oiled cover, it should be dry behind the cover as behind the cover is just the crank cases. The only output from the crank case is the crank itself with the alternator on it. And using my experience from the TZR this is sealed into the crankshaft and separated from the engines transmission oil. I am concerned.