Update

- fix all the bugs