minor style tweeks, a couple more songs