Code/graph improvements