Tweaked some stuff in the graph keys