fixed some bugs :D
fixed some bugs :D