Added Lionel's edits and comments.

Signed-off-by: Jouni Korhonen <jouni.korhonen@iki.fi>