Update comment to reflect bug improvement.
Cleanup.
Doc fix.