MORE EMACS CHANGES