Thanks guys. As of right now, the motor has been cleaned, and the brushes and springs are replaced. I have the e-unit disassembled (so far it seems nicer than a Lionel one). I am going to clean that up and replace the fingers in there.
What parts do I need exactly for the smoke unit.? I am assuming it is the smoke wick kit which they say is out of stock? You have to excuse my stupidity with this. I was expecting a liquid smoke unit like a modern engine, just an element next to a wick. This seems to be more complicated.