Only according to the credits. He was never actually named in dialogue, so I choose to believe that was Mr. Johnson from "Day of the Dove" instead.
Same here. I was very pleased when I noted that. Would have been a fun thing for them to fix when they were doing the HD/Blu-Ray set.