fixed some import and jquery bugs