fix bug and update