lots 'o changes for emacs