Incorporate most of Ben's feedback.