Edits, corrections, mainly comments