Importer working even better, comments can be enabled/disabled