Fix up a few old tunes, add several more.