update and fix some issue