Add some more emacs editing stuff.

Other small changes. Just look at the diff.