fixed importer
more fixes