finished video pull request, fixed bugs