Beginnings of automatic ad detection; improve handling of artist/song names