Improvements: webcam + video file