Major changes

I Find that the below changes fixes a lot of problems with our video's
Hope you can integrate some of this in the main branch!