Working video.
Minor changes.
Merge branch 'Video'