more graph improvements