Add comment.
Minor bug fixes.