additions and rewrites of .emacs

Among other things.