Fix up the comments.
merge fix.
fin