fixed import errors and other things