Some Emacs changes
Some more Emacs changes