Lots of emacs changes