fix issues in adding comments