Merge pull request #8 from markkho/master

Graph cleanup
Some more bug fixes