some fixes to video tracking