Mainly .emacs changes.