Great suggestions.  They are incorporated in the new version.