Fixing up some of the emacs setup