update to songs.c and editor.c