edit some bugs