fixes #583 and other export issues
Merge pull request #730 from debrief/issue583_SAM_Export

fixes #583 and other export issues