Update with remarks from the mailing-list.
Correction of grammar and mistakes.