More graph touch-ups