retooled 4-4-0 disassembly

[Texianbear54]

I have studied the parts diagrams for the "York," for both the tender and locomotive, but cannot tell how the trucks are attached to the tender or how the smokestack is attached to the boiler.
My "York" seems to be having some issues with pick-up and the wipers seem to be barely touching the axles. 
Also, the top of the spark arrester is slightly askew and I wanted to line it up, but don't want to break a $300.00 locomotive. The parts diagram actually shows the cover of the spark arrester being a separate piece, but it did NOT seem to want to move.

Any help would be appreciated.

Doug Weiskopf