I fix some bugs