Integrate Zoltan's feedback from my changes after examiner #1.