Some comment improvments.