Add comments to vimrc plus some minor adjustments