fixed import and export bugs