some notes, some minor edits, Pierre's edits