fix some bugs 5 left
fix bugs leff 2
merge with master