Added rest of Chearlie's comments.

Signed-off-by: Jouni Korhonen <jounikor@gmail.com>