Fixes for ending the video properly, less redundant redownloading