fix bugs, backup