few changes from emacs-starter-kit