fixed bug
fixed some bugs