Ok, I tacked on the bugs in the video to #2504.