graph and other minor updates