Fixing autocmd, <esc> tweaks