updated with emacs stuff