fix some issue and code modify