Update some bugs