Re-commit to fix various minor issues for new release.