augroup-ed autocmds and minor changes