Added some stuff to emacs