fix some error and update