Fixes to graph and event system. fork release for 2.0