More comments and more features included