some fixes with video gap