fix some buges
bugs