fix typos
update according to Guillaume Pierre, Johann and François feedbacks (work in progress)
update according to Johann's feedbacks
update according to Johann's feebacks