Implementing full graph mode, fixing graph bugs