Hi Bach Man,
Just a nit, but I found, while looking for parts, that there's a part on the pilot of the locomotive that's sort of a guard rail, but Bachmann parts calls it a Johnson bar; it's not a Johnson bar!
It's part number 00H04 on the parts diagram.
Just thought I'd let you know.
jv