I also noticed you may have the headlamp in the wrong place. If you're going to do the facelift lollypop thing, you gotta work on the pilot air tank. The directions also tell you what to do. You have to remove the walkway from that air tank and put it on the smokebox face.
Or you can just flip the generator and lamp from what you have now. SPF's will call you out on that one
As far as those marker lights go, I didn't put them on my tender until after I painted my tender with FCC. I don't know if you are plan to do that or not, but I chose to. Rumor has it that they didn't start painting cab roofs and tender tops FCC until the M1. I painted it to keep with my theme of the rest of my steam. Plus I like the way it looks...so yeah. I'm being totally subjective there.
Maybe I'll get called out on it by an SPF on it someday