more songs and a few style fixes/changes