move custom stuff, add emacs-lisp hooks