It was a great episode and I'm glad you're warming to Amy, even just a little.

A good combination of both River and the Weeping Angels.

And, re: your invisi-text spoiler, I will bet that story comes before this one in her timeline. In fact, it might even have something to do with her going to jail - but that's just my wild guess based on information in this episode. But, yeah, I'm sure Moffat is going to go more timey-wimey on us later.