fixed typo bug
fixed some bugs