Fixed misleading comment.
Minor bug fixes.