SPOILERS . . . sort of.
Probably want to change the text color of the spoilers to white.
As far as the Rumple line goes...It felt clunky. The death felt cheap and I was having flashbacks going...wait, didn't we go through this just last season? Rumple was wandering first though, and then Neal showed up after Rumple ran off, so, it technically worked. I felt like they amped up all these 'voices' in his head but in reality, it really only turned out to be one. So, that was a bit of a let down