fix

get some bug done