Yes, to Marietta Edgecomb deserving what she got, but also I'm a lot less sympathetic to Cho Chang now than I was then. Her friend CLEARLY did not want to be there from the get-go. She endangered everyone by dragging her along.

Obviously this doesn't apply to the movie version, where it's heavily implied Umbridge only got information out of Cho by using Veritaserum. In fact, there are a lot of places where the movie and book canons diverge in really interesting ways.

And I liked Dawn too. :) I've talked a lot more people who like her than don't, honestly. I wonder if that opinion has gone by the wayside now?