Update

- fix some bugs