some small fix，uncompleted