fix some bugs
q
23