further export script enhancements