export fixes
Merge branch 'databaseedits'