Fixed bug and better playlist support