It was just a recap error. No spoiler: Joffrey is on deck to marry Margery, they've been talking about it for several episodes.

Joffrey wanted to serve Sansa her brother's head at his wedding. Hers happened already.

It looks like Gendry the Blacksmith will be filling the role of Edric Storm.

I'm sure someone else has reminded you by now that the Maester tending Jamie is Qyburn, who was dischained by the Citadel for doing creepy things with dead bodies. As of late, he's created a zombie Kingsguard man for Cersei using the body of Gregor Clegane.