Some comment and output changes.