Bug fixes: Tracking works again, Video playback is more robust