add more comments and UTF-8