Improved playlist, bugfix #8