Fixed comment.
Bug fixes and refinements.
Numerous bug fixes and refinements.