more file error edits
Merge branch 'databaseedits'