Graph improvements and other fixes.
