Reordered .emacs; minor fixes