Much better, but not good considering the time I've spent on it. No water in the engine oil or gear box from what I could tell. But the final drive has some in it. I pulled about 30cc of contaminated oil out with a syringe. Once warmed up, I'll probably change all the oils again. I've just put a new oil filter in before I left for the ride. I wonder if I can leave that?