Updated comments and notifications