fix some bugs

.