some small improvements to Song, mostly in adaptability