fixed some bugs
wq