fix some small bugs,