Much better than last week, so kudos to the writers for stepping up again. I was kind of confused by the plot thread of Mr. Gold being thwarted and not able to leave like everybody else. I thought he had known all along that he was still Rumpy, like Regina knew she was the EQ? How could he "lose" himself, then? That was a minor nit, though. Overall, I really enjoyed it.
My favorite line came from Grumpy. When somebody asked him whether his news about the line was bad, and he responded, "If it weren't would I have come running up here yelling TERRIBLE NEWS!" I love Grumpy! And yeah, the line about "even David could do it" was a close second. That was a lovely speech that Charming gave at the end. It's nice to him reasserting himself and shedding the David persona. Also really nice to Regina reverting to her early, sweet self. Does make you wonder who the villain will be, though. Rumpy? Cora?