backing up
fix bugs