Switch to emacs, make updates