video player, some other fixes