fix for emacs update, various improvements