order export, minor element fixes/enhancements