playlist handling fix

+ some other improvements