Fix bugs and backup data