Many emacs changes from MBAir.