More Song/VorbisSong fixes. It's still a bit buggy