more cleanup and bug fixing for youtube tracking