Comment tweaks. Added autocmd! to prevent autocmd dups.