clean the rubbish
turn on eldoc for prog-mode
sync with upstream