Agreed, it was a messy episode. I think its mistake is cramming too many plot points as a build-up to the finale, so that it becomes disjointed as an episode in its own right.