last few additions beore a big new version.