Added the abillity to comment and categorize