Some elisp tweaks, and more