decorate comment
more tweaks