fix missing imports, fix import lines