improve and fix import bugs