fix some bags
Some bugs fixed
backup