editing of old comments added. Refs: #63.
Very much as proposed by Robert Campbell in CPC 1.7rc5
with some adaptations in order to preserve the previous behavior as much as possible.

Signed-off-by: Josef Templ <josef.templ@gmail.com>