Benja's edits merged in (from WriteLatex)