restore support symbols
trim end-line space on multi-line comments for enhanced appearance
consider class names part of global scope
update