Fixed for comments
Still need to do IImporter plugins and docstrings