adding data backup, bug fixes