bugfix: too many comment quotes

+ small decorations