fixed all comments by @mintsoft and @mattr555, except coloring