Better tracking support. Also fixed playing the same video again bug.