graph and other improvements