some cleaning, fixing... batch import should work now