Improved comments/doc.
Couple minor issues.