many changes, clean-up, cider
back to emacs