Buf fix on graph generation for videos, other general improvements