Changes all over, a lot of them towards Emacs

(I think...)