Fix scanner

I think I did a decent job of fixing the song scanner.