fix underscore parsing, add import_from