update as of august 27 @ 11:33 am

- Fix some bugs