cache songs, tidy up a little