Many graph improvements
More fixes