Fix diff bug, rename dbFile variable to dbFilePath, some other stuff.