Final edits and additions
also corrected Guillaume's name.
Damn the french anyway