August 11 Update

github says there're still uncommitted changes but I already committed
all changes done.

Committing again.