some plugin fixes and folding for vim