fixed import errors etc