Fixes and added checking of the current video which should work.