Add new comments and bug fix