All that, plus turning Corpse Witch from "smug jerk whose arguments actually make sense" to "evil cackling supervillainess".