Did a bunch of filter changes, oil, cdr valve, and fuel. While the fuel filter was off, I wiped off, then brass brushed, the sensor. It still shows water in fuel.
I also did a bunch of electrical work. I cleaned all the bus bar connections and dielectric greased them, and also the headlight...