fix some bug
some changes