Various changes to the .emacs