update based on prelude, emacs updates