Cleanup and add a few songs