improved folding, fixed autocmd for filetypes