more songs and fixes