update bug and fixit