Graph DS 17th commit.

- Fix a lot of minor bugs.