Minor fixes

Now the same song cannot be played twice in a row