Fixed up song regexes