A lot of changes

New importers and fixed importer also minor changes and larger ones.