nodeshot importer + general cleanup