Update this.
Fix typos. Mess around with the video handler interface a bit more.
Build fix x2.