Some cleanup & bug fixes

And also creating a playlist manager