improved emacs mode