export updates

not ready for merge or even QA yet, just so it's easy to see changes.