further improvements from https://github.com/rafi/vim-config