add full video, small fixes
merge