Various import/export fixes
Merge branch 'master' of https://github.com/ESpearman/COMP3350-Group-Project