Fix error preventing playing of tracks after a track totally finished
Hook up new metadata discovery
Improve Demo Songs, add a few more