minor interface changes and bug fixes