Active playlist support
More playlist / cleanup