fix some bug
merge work
fix bug