Added correct link for comments and correct display for the number of comments