More cleanup, and adding step-by-step for showing playlists