final additions to initial version.