Updates comments (17/25)

Updates comments