Ok, Don - you're half way there - now you need to add this to your freight siding that way you will have two cranes to do the needed work in and around the freight/station area.
As for your missing windows - you are correct, they were frosted and at one point someone made reproductions but I can't recall who it was.