Text fixes
import/export for some core classes