The negative post on my battery has a second ground connector stacked over the negative cable connector. I couldn't get the terminal screw to seat with three connectors stacked on it. I clipped the connector off the negative tender lead and soldered it to the second connector.
The headlamp is Silverstar ZXE 9003 (H4) the driving lamps are Silverstar H3, I couldn't find the ZXE for the driving lamps locally. Due to a shorter service life for these bulbs the stock bulbs went in the pannier in case of a burnout on a long haul.