fixed some bugs
1