fix most of comments