improvements for emacs