minor update and some fix