fixed some bugs
.