fix some bugs and backup