Fixed comments to reflect addition of new features.