Misc updates - mostly emacs updates