Fixed db errors and other assorted data