solve some bugs
.