User blog:Dryuuu/What episode do you think this was from?

I remember looking through the trailer and, like many of us, wondering '''oh my gosh what is going on there, I gotta see! This trailer: http://www.youtube.com/watch?v=DI1mbkEoPXk'''

Well, after watching all of season 4 and seeing the trailer again, all of those thoughts were satisfied, except for two: I would like to discuss which episode and which part of a scene they were cut from! Hopefully we see them in the DVD coming out on the 23rd, I think.
 * 1) The Dochraid laughing at 1:29. I had the impression she was evil and in league with Morgana and that the cast would meet her, but she was treated more like a prop.
 * 2) Morgana at 1:27 screaming after uncovering Emrys who was hiding under a blanket.

So I wonder, my main questions about the ones I brought up are:

Did the writers originally want to do more with the Dochraid?

The Dochraid in the scene we saw had no reason to laugh at anything, so what could we have missed out in her and Morgana's conversation? I hope we see the Dochraid again, as ugly as she is!

Was the scene with Morgana and Emrys in her hut, or in her room in The Sword in the Stone when Emrys was placing the poppet under her bed? Maybe he frightened her then fled the room.

Or it could have been an alternate scene for when he was retreiving the Fomorroh from her hut.

What are your thoughts, and are there any other things you've noticed in any of the trailers that I didn't point out.