further interface changes and bug fixes