diff --git a/nvim-init.vim b/nvim-init.vim
index b12b933..bc478ce 100644
--- a/nvim-init.vim
+++ b/nvim-init.vim
@@ -332,13 +332,13 @@ call plug#begin('~/.config/nvim/plug')
 "Plug           'kana/vim-operator-user'                                        " define your own operator easily
 "Plug       'junegunn/vim-peekaboo'                                             " preview registers when pressing \" or @
  Plug           'gcmt/wildfire.vim'                                             " smart selection of the closest text object
- Plug       'Valloric/YouCompleteMe',        { 'for': ['c', 'cpp', 'python', 'haskell'], 'do': 'git submodule update --init --recursive && ./install.py --system-libclang --system-abseil --system-boost --clang-completer --ts-completer' }  " code-completion engine
-"Plug         'Shougo/deoplete.nvim',        { 'do': ':UpdateRemotePlugins' }   " code-completion engine
-"Plug 'deoplete-plugins/deoplete-jedi',      { 'for': ['python'] }              " complete python
-"Plug         'Shougo/deoplete-clangx',      { 'for': ['c', 'cpp', 'objc'] }    " complete C, C++, Objective-C
-"Plug           'copy/deoplete-ocaml',       { 'for': ['ocaml'] }               " complete OCaml
-"Plug         'Shougo/neco-syntax'                                              " complete based on syntax files
-"Plug        'paretje/deoplete-notmuch',     { 'for': 'mail' }                  " complete addresses from notmuch
+"Plug       'Valloric/YouCompleteMe',        { 'for': ['c', 'cpp', 'python', 'haskell'], 'do': 'git submodule update --init --recursive && ./install.py --system-libclang --system-abseil --system-boost --clang-completer --ts-completer' }  " code-completion engine
+ Plug         'Shougo/deoplete.nvim',        { 'do': ':UpdateRemotePlugins' }   " code-completion engine
+ Plug 'deoplete-plugins/deoplete-jedi',      { 'for': ['python'] }              " complete python
+ Plug         'Shougo/deoplete-clangx',      { 'for': ['c', 'cpp', 'objc'] }    " complete C, C++, Objective-C
+ Plug           'copy/deoplete-ocaml',       { 'for': ['ocaml'] }               " complete OCaml
+ Plug         'Shougo/neco-syntax'                                              " complete based on syntax files
+ Plug        'paretje/deoplete-notmuch',     { 'for': 'mail' }                  " complete addresses from notmuch
 "Plug 'Thyrum/vim-stabs'
  Plug          'tpope/vim-speeddating'                                          " increment dates and more with Ctrl-A/Ctrl-X
 
@@ -510,40 +510,42 @@ let g:wildfire_objects = ["iw", "i'", "i`", 'i"', "i)", "i]", "i}", "ip", "it"]
 
 " YouCompleteMe {{{2
 " ------------------
-noremap <leader>g :YcmCompleter GoToImprecise<CR>
-noremap <leader>gg <esc>:YcmCompleter GoTo<CR>
-noremap <leader>gi <esc>:YcmCompleter GoToImprecise<CR>
-noremap <leader>gf <esc>:YcmCompleter FixIt<CR>
-noremap <leader>st <esc>:YcmCompleter GetType<CR>
-noremap <leader>si <esc>:YcmCompleter GetTypeImprecise<CR>
-
-let g:ycm_enable_diagnostic_highlighting=0
-let g:ycm_complete_in_comments=1
-
-let g:ycm_seed_identifiers_with_syntax=1
-let g:ycm_collect_identifiers_from_tags_files=1
-let g:ycm_add_preview_to_completeopt=1
-let g:ycm_autoclose_preview_window_after_insertion=1
-
-let g:ycm_server_python_interpreter='/usr/bin/python3'
-let g:ycm_global_ycm_extra_conf='~/.config/nvim/ycm_extra_conf.py'
-let g:ycm_extra_conf_globlist = ['~/wlk/*', '~/doc/*','~/dev/planet-warrior/*','~/uni/*'] "  ,'!~/*'
-"let g:ycm_rust_src_path='/data/programming/rustc-1.7.0/src'
-set completeopt=menu
+" noremap <leader>g :YcmCompleter GoToImprecise<CR>
+" noremap <leader>gg <esc>:YcmCompleter GoTo<CR>
+" noremap <leader>gi <esc>:YcmCompleter GoToImprecise<CR>
+" noremap <leader>gf <esc>:YcmCompleter FixIt<CR>
+" noremap <leader>st <esc>:YcmCompleter GetType<CR>
+" noremap <leader>si <esc>:YcmCompleter GetTypeImprecise<CR>
+" 
+" let g:ycm_enable_diagnostic_highlighting=0
+" let g:ycm_complete_in_comments=1
+" 
+" let g:ycm_seed_identifiers_with_syntax=1
+" let g:ycm_collect_identifiers_from_tags_files=1
+" let g:ycm_add_preview_to_completeopt=1
+" let g:ycm_autoclose_preview_window_after_insertion=1
+" 
+" let g:ycm_server_python_interpreter='/usr/bin/python3'
+" let g:ycm_global_ycm_extra_conf='~/.config/nvim/ycm_extra_conf.py'
+" let g:ycm_extra_conf_globlist = ['~/wlk/*', '~/doc/*','~/dev/planet-warrior/*','~/uni/*', '~/dev/wl-overlay/*'] "  ,'!~/*'
+" "let g:ycm_rust_src_path='/data/programming/rustc-1.7.0/src'
+" set completeopt=menu
 
 " deoplete {{{2
 " -------------
 
-"let g:deoplete#enable_at_startup = 1
-"let g:python3_host_prog = "/usr/bin/python3"
-"
-"call deoplete#custom#option({
-"\ 'camel_case': v:true,
-"\ 'smart_case': v:true,
-"\ })
-"
-"set completeopt=menu,preview
-"set completeopt-=noinsert
+let g:deoplete#enable_at_startup = 1
+let g:python3_host_prog = "/usr/bin/python3"
+
+call deoplete#custom#option({
+\ 'camel_case': v:true,
+\ 'smart_case': v:true,
+\ })
+
+set completeopt=menu,preview
+set completeopt-=noinsert
+
+inoremap <C-Space> 
 
 " CtrlP {{{2
 " ----------
@@ -670,8 +672,8 @@ let g:ale_linters = {
 \   'python':   ['pylint', 'mypy'],
 \   'markdown': [],
 \   'cpp':      [],
+\   'c':        [],
 \}
-"\   'c':        [],
 let g:ale_lint_on_text_change='normal'
 let g:ale_lint_on_insert_leave=1
 let g:ale_lint_delay=500