fix some bugs and update