more emacs changes