Jeff,
There's a lot to be improved in the owners manual for this little gem, as there is more to take apart than what is shown. There is the screw in the smoke stack, 2 screws on the underside of the frame and two screws in the drive linkage going to the frame.
I also removed the front and rear trailing trucks for easy cleaning and lubrication. It was tricky to say the least to get the motor and drive wheel assy out of the shell without cutting or pulling on any of the wiring. After getting it out, it appeared that all connectors were seated . However, I pushed on them anyway and gave 1/4 twist to the one wire nut. Since I had it apart, I decided to check the gearbox. Everything was well lubricated, but dirty, so I cleaned the gears and applied a small amount of lithium grease to the gears
CAUTION - When removing the 2 screws to the gearbox be very careful as there are 4 minute washers that are part of it and you will need to see where they fit in.
I carefully put it all back together,making sure not to pinch any of the wires going back into the shell and lubricated the axles, drive rods, and wheels. After completion, I gave the engine and tender a nice coat of Meguiar's cleaner wax and handled with my brown jersey gloves as help to prevent finger prints in the paint.
I then carefully attached the engine and tender and placed on the track and fired it up. I ran it for 20-30 minutes and no headlight issues or jerking. When you do this give yourself a few hours. Hope this helps.
JoeG