fixed some export related issues (performance, etc.)