backup, fix some issues