update as of august 29 @ 11:55 am

- Fix some bug