and while here adjust slightly the comment headers.