fix for desktop playback
Improved handling of station names
Merge pull request #6 from mikedm139/master

That was way harder than it needed to be