Pretty decent episode. I don't mind leaving Amy that much, but I will miss Rory. Seemed a little out of the blue for The Doctor to all of a sudden decide that they should part ways. Unless something in that room reminded him of their mortality.
There was one thing that I did NOT like though... As someone with SEVERE ichthyophobia, I did not appreciate the aquarium and am still VERY disturbed by happened to the creature inside it.
Oh, and nice to hear a Star Trek reference .