I've finally figured out why this Doctor has been so lackluster for me... The fact that there three companions seems to always be the dragging force when the writer tries to give them each their own storyline plot in an episode. This episode shows that when they're all working together, trying to help the Doctor figure out what's going on, the story is better for it. When the writer gives them each their own plot thread, the episode seems too disjointed.