fix/update emacs and stuff