Minor tweaks to the click catcher
Update deps, CodeMirror 4.1