fix some issue

not finish yet