some bugs fixd