Changes of comments and doc