* clean up
+ add new graph classes