Add key maps and more comments
Move autocmd into if block