add emacs-music
various touch up