Add autocmd guards
Little fixes
More support for plugins