I know, they're really building Shae as a noble-hearted character. I wonder if they'll show her testifying at court that Tyrion killed Joffrey and made her call him "my giant of Lannister" to chuckles throughout the court.

I really hope they stage the discovery of Catelyn's body like they did in the book. With Arya's direwolf Nymeria pulling her out of the water and then being scared away by the Brothers Without Banners. They could still portray her as rather dead and then show her in a later episode as Lady Stoneheart at the Frey…

I think it's pretty clear. Here's a passage from the book:

Who needs gunpowder when you have pyromancers?