playlists added and general cleanup