Updates comments (16/25)

Updates comments