Whether the next episode answers those questions or just compounds them is hard to say. It's probably better to wait until you finish this season, I think it's just one more episode left after the black cubes. Without needing spoilers because it's not the theme or a major part of the season finale or anything, we've probably all wondered how long companions and the Ponds in particular travel with the Doctor in their relative time? Sometimes it's obvious, sometimes not, and possibly there are many adventures besides the ones in the shows or even books! The characters are always referencing 'past' adventures, one which, like I say, weren't on the show. I think the series creators are pretty meticulous in monitoring timelines with everything including gaps indicated, but I'm not sure it's possible to the same extent for viewers. Even they throw up their hands occasionally and say it's just one of those 'timey-wimey' things.