First round of comments.

This resolves the first step from issue #2908.

Next step: Put user message strings into an appropiate place.