Some comment modifications.