Vast sweeping emacs changes