More changes, trying to get export going