Added/edited comments