Agree 100% - the whole Ellison thing is odd, I have a nasty feeling that at some point Catherine Weaver is going to start imitating him.

The business with the water glass may have been some sort of clue - if it was cold you'd expect there to be condensation fingerprints on it, and there weren't. Will Ellison pick up on that, or is it just me being over-observant?

Next week I think Wikipedia says they're doing an amnesia plot, which is a bit worrying - that's usually a sign of slight desperation from the scriptwriters!