various changes; updated emacs config