Updates comments (19/25)

Updates comments