diff --git a/coc-settings.json b/coc-settings.json
index 98fe85a..eb8a062 100644
--- a/coc-settings.json
+++ b/coc-settings.json
@@ -2,14 +2,17 @@
     "suggest.autoTrigger": "none", 
     "suggest.timeout": 500,
     "pyright.disableDocumentation":false,
+    "pyright.inlayHints.variableTypes":false,
+    "pyright.inlayHints.parameterTypes":false,
+    "pyright.inlayHints.functionReturnTypes":false,
     "python.analysis.diagnosticSeverityOverrides":{
         "reportUnboundVariable":"none"
     },
     "hover.target": "preview",
     "clangd.path": "/usr/bin/clangd",
     "python.formatting.provider": "black",
-    "python.formatting.blackPath": "/home/aselimov/.local/bin/black",
     "python.formatting.blackArgs": ["-l","100"],
-    "coc.preferences.formatOnSaveFiletypes": ["python"]
+    "coc.preferences.formatOnSaveFiletypes": ["python"],
+    "java.inlayHints.parameterNames.enabled": "none"
 }
 
diff --git a/ftplugin/gitcommit.vim b/ftplugin/gitcommit.vim
new file mode 100644
index 0000000..9d9bb91
--- /dev/null
+++ b/ftplugin/gitcommit.vim
@@ -0,0 +1,2 @@
+set colorcolumn=72
+set tw=72
diff --git a/ftplugin/java.vim b/ftplugin/java.vim
new file mode 100644
index 0000000..5d70679
--- /dev/null
+++ b/ftplugin/java.vim
@@ -0,0 +1,2 @@
+set colorcolumn=100
+set tw=100
diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim
index d3aa765..7c04200 100644
--- a/ftplugin/markdown.vim
+++ b/ftplugin/markdown.vim
@@ -1,3 +1,4 @@
+inoremap <Space><Space> <Esc>/<++><Enter>"_c4l
 set spell spellfile="~/.config/nvim/spell/wordlist"
 let g:markdown_fenced_languages = ['html', 'python', 'bash=sh', 'fortran']
 "set conceallevel=2
diff --git a/init.vim b/init.vim
index 2ecb506..9e57142 100644
--- a/init.vim
+++ b/init.vim
@@ -18,6 +18,10 @@ Plug 'nvim-telescope/telescope.nvim'
 Plug 'neoclide/coc.nvim', {'branch': 'release'}
 Plug 'christoomey/vim-tmux-navigator'
 Plug 'GCBallesteros/vim-textobj-hydrogen'
+Plug 'nvim-telescope/telescope-live-grep-args.nvim'
+Plug 'folke/todo-comments.nvim'
+
+
 
 " List ends here. Plugins become visible to Vim after this call.
 call plug#end()
@@ -106,8 +110,6 @@ filetype plugin on
 let g:vim_markdown_folding_disabled = 1
 
 "Keybindings 
-inoremap <Space><Space> <Esc>/<++><Enter>"_c4l
-"map <C-f> :NERDTreeToggle<CR>
 map <C-s> :set spell spellfile=~/.config/nvim/spell/wordlist.utf-8.spl
 
 "Set up some Asyncrun commands
@@ -170,8 +172,12 @@ lua require'colorizer'.setup()
 
 "Set up telescope 
 lua require('telescope_settings')
-nnoremap <silent> <C-g> <cmd>Telescope live_grep<cr>
-nnoremap <silent> <C-f> <cmd> Telescope find_files shorten_path=true<cr>
+nnoremap <silent> <C-g> <cmd>lua require('telescope').extensions.live_grep_args.live_grep_args(require('telescope.themes').get_ivy({}))<cr>
+xnoremap <silent> <C-g> "zy:lua require('telescope').extensions.live_grep_args.live_grep_args(require('telescope.themes').get_ivy({}))<cr><c-r>z
+nnoremap <silent> <C-f> <cmd> Telescope find_files shorten_path=true theme=ivy<cr>
+nnoremap <silent> <A-g> <cmd> Telescope live_grep grep_open_files=true theme=ivy <cr>
+vnoremap <silent> <A-g> "zy:Telescope live_grep grep_open_files=true theme=ivy <cr><c-r>z
+" Change an option theme=ivy<cr>
 "
 "Neomutt settings
 autocmd BufNewFile,BufRead /tmp/neomutt* set noautoindent filetype=mail wm=0 tw=0 nonumber nolist
@@ -189,3 +195,6 @@ nnoremap <C-H> <C-W><C-H>
 "iron.nvim
 lua require('iron')
 set formatoptions-=o
+
+"todo-comments
+lua require("todo-comments").setup()
diff --git a/lua/telescope_settings.lua b/lua/telescope_settings.lua
index bbdc175..84b3a5a 100644
--- a/lua/telescope_settings.lua
+++ b/lua/telescope_settings.lua
@@ -1,5 +1,5 @@
 require('telescope').setup{
     defaults = {
-        path_display={"smart"}
+        path_display={"smart"},
     }
 }