and missing function, and minor change
various changes