fixed several import errors