Looking at an old post, you actually fixed the whack by cleaning the earth's under the tank. Clean them again, clean them better, let them dry and reassemble.
The cancel plug is with the right hand plug under the tank. A single wire, brown/white on one side, brown on the other.
With my brick on the centre stand, at~1100rpm, in second gear, the indicators turned off automatically at 50 seconds.