Mostly .emacs changes