Improved song generation