fix some bugs
q
q