Changes after Sébastien Gilles' review

Sébastien's reviews and my replies are summarized in this document to be shared with him.