Cheers Neil:
Fuel pump connections: I did it the hard way after only recently overhauling the fuel tank - I fitted the pump first and the connected the wires up to it once seated.
Kill switch -
YES - I noticed water when turning the switch; time for some disassembly and investigation perhaps.
Coils - dare not go there - I have a set of Dyna coils waiting in the garage and if any mtce takes place near the coils, I know I wont be able to help myself
Cheers - Frank