Lots of changes for emacs config