Fixed the group updates and comments