fix bugs
fix bugs in import