1) Lugged wires from CDI to battery with terminals to match the battery post. 2) Debugged master switch circuit, moved one wire, and removed another. 3) Moved the ground wire for the tach.
I was unhappy with having the wire dangling in the air between the ignition coil and the ground originally used. I became convinced that vibration would eventually snap the wire. The new location provides good mechanical support.