In this episode, when talking to (Dr.) Stanley in the teaser, Josh says that he is the Deputy Chief of Staff, and that he reports to "Leo McGarry and the President." All well and good, except that there have been several scenes prior to this episode where Toby has appeared to give Josh orders (including the episode just prior to this when--after Leo asks Josh to help Toby sort through the issues surrounding the putting of a Puerto Rican politician on a postage stamp--Toby single-handedly makes Josh do the task himself). Now, in this episode, it reverses, when Josh orders Toby to remove the brass quintet from the lobby. So, did Sorkin realize his screw-up and try to fix it from this point on, or what?