interface changes and minor fixes