incomplete
video support added
Merge branch 'video'
misc fixes