edit some bug