diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el
index 7b47f0f..26f31a1 100644
--- a/.emacs.d/custom.el
+++ b/.emacs.d/custom.el
@@ -13,6 +13,7 @@
  ;; If there is more than one, they won't work right.
  '(compilation-scroll-output t)
  '(electric-pair-pairs (quote ((34 . 34) (123 . 125))))
+ '(flycheck-c/c++-clang-executable "clang-3.8")
  '(flycheck-gcc-args (quote ("")))
  '(flycheck-gnat-include-path (quote (".")))
  '(flycheck-python-flake8-executable nil)
@@ -20,9 +21,129 @@
    (quote
     (dockerfile-mode dired+ flycheck-pyflakes abyss-theme helm-projectile projectile ggtags ssh nlinum solarized-theme helm-flycheck helm-flyspell yaml-mode web-mode sr-speedbar sokoban smart-compile pythonic python-mode powerline poker php-mode openwith markdown-mode magit json-mode js-comint jedi javadoc-lookup java-snippets java-imports hydandata-light-theme helm-spotify helm-package helm-ls-git helm-bibtex flycheck-pos-tip flycheck-color-mode-line fish-mode diffview cython-mode company-web company-math company-jedi company-dict company-c-headers company-auctex ac-octave ac-math ac-c-headers 2048-game)))
  '(py-flake8-command "/usr/bin/python3 -m flake8")
+ '(py-python-command "python3")
  '(safe-local-variable-values
    (quote
-    ((company-clang-arguments "-std=c++14" "-Iinclude")
+    ((eval progn
+           (setq flycheck-clang-include-path
+                 (list
+                  (concat root-path "/vendor/rapidjson/include/")
+                  (concat root-path "/vendor/tclap/include/")
+                  (concat root-path "/lib/build/include/")
+                  "/opt/ibm/ILOG/CPLEX_Studio127/cplex/include" "/opt/ibm/ILOG/CPLEX_Studio127/concert/include"))
+           (setq flycheck-clang-args
+                 (quote
+                  ("-W" "-Wall" "-DS_CPLEX")))
+           (setq flycheck-clang-language-standard "c++14"))
+     (eval setq company-clang-arguments
+           (list "-std=c++14" "-DS_CPLEX"
+                 (concat "-I" root-path "/vendor/rapidjson/include/")
+                 (concat "-I" root-path "/vendor/tclap/include/")
+                 (concat "-I" root-path "/lib/build/include/")
+                 "-I/opt/ibm/ILOG/CPLEX_Studio127/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio127/concert/include"))
+     (eval progn
+           (setq flycheck-clang-include-path
+                 (list
+                  (concat root-path "/lemon/include/")
+                  "/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "/opt/ibm/ILOG/CPLEX_Studio1263/concert/include"))
+           (setq flycheck-clang-args
+                 (quote
+                  ("-W" "-Wall" "-DS_CPLEX" "-DIL_STD")))
+           (setq flycheck-clang-language-standard "c++14"))
+     (eval setq company-clang-arguments
+           (list "-std=c++14" "-DS_CPLEX" "-DIL_STD"
+                 (concat "-I" root-path "/lemon/include/")
+                 "-I/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio1263/concert/include"))
+     (eval progn
+           (setq flycheck-clang-include-path
+                 (list
+                  (concat root-path "/vendor/tclap/include/")
+                  (concat root-path "/vendor/tclap-tuple/include/")
+                  (concat root-path "/lib/inc/")
+                  "/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "/opt/ibm/ILOG/CPLEX_Studio1263/concert/include"))
+           (setq flycheck-clang-args
+                 (quote
+                  ("-W" "-Wall" "-DS_CPLEX" "-DIL_STD")))
+           (setq flycheck-clang-language-standard "c++14"))
+     (eval setq company-clang-arguments
+           (list "-std=c++14" "-DS_CPLEX" "-DIL_STD"
+                 (concat "-I" root-path "/vendor/tclap/include/")
+                 (concat "-I" root-path "/vendor/tclap-tuple/include/")
+                 (concat "-I" root-path "/lib/inc/")
+                 "-I/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio1263/concert/include"))
+     (eval progn
+           (setq flycheck-clang-include-path
+                 (list
+                  (concat root-path "/vendor/tclap/include/")
+                  (concat root-path "/vendor/tclap-tuple/include/")
+                  (concat root-path "/lib/inc/")
+                  "/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "/opt/ibm/ILOG/CPLEX_Studio1263/concert/include"))
+           (setq flycheck-clang-args
+                 (quote
+                  ("-W" "-Wall" "-DS_CPLEX")))
+           (setq flycheck-clang-language-standard "c++14"))
+     (eval progn
+           (setq flycheck-clang-include-path
+                 (list
+                  (concat root-path "/vendor/tclap/include/")
+                  (concat root-path "/vendor/tclap-tuple/include/")
+                  (concat root-path "/lib/inc")
+                  "/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "/opt/ibm/ILOG/CPLEX_Studio1263/concert/include"))
+           (setq flycheck-clang-args
+                 (quote
+                  ("-W" "-Wall" "-DS_CPLEX")))
+           (setq flycheck-clang-language-standard "c++14"))
+     (eval setq company-clang-arguments
+           (list "-std=c++14" "-DS_CPLEX"
+                 (concat "-I" root-path "/vendor/tclap/include/")
+                 (concat "-I" root-path "/vendor/tclap-tuple/include/")
+                 (concat "-I" root-path "/lib/inc/")
+                 "-I/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio1263/concert/include"))
+     (eval progn
+           (setq flycheck-clang-include-path
+                 (list
+                  (concat root-path "/vendor/rapidjson/include/")
+                  (concat root-path "/vendor/tclap/include/")
+                  (concat root-path "/lib/build/include/")
+                  "/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "/opt/ibm/ILOG/CPLEX_Studio1263/concert/include"))
+           (setq flycheck-clang-args
+                 (quote
+                  ("-W" "-Wall" "-DS_CPLEX")))
+           (setq flycheck-clang-language-standard "c++14"))
+     (eval setq company-clang-arguments
+           (list "-std=c++14" "-DS_CPLEX"
+                 (concat "-I" root-path "/vendor/rapidjson/include/")
+                 (concat "-I" root-path "/vendor/tclap/include/")
+                 (concat "-I" root-path "/lib/build/include/")
+                 "-I/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio1263/concert/include"))
+     (eval progn
+           (setq flycheck-clang-include-path
+                 (list
+                  (concat root-path "/vendor/tclap/include/")
+                  (concat root-path "/vendor/tclap-tuple/include/")
+                  "/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "/opt/ibm/ILOG/CPLEX_Studio1263/concert/include"))
+           (setq flycheck-clang-args
+                 (quote
+                  ("-W" "-Wall" "-DS_CPLEX")))
+           (setq flycheck-clang-language-standard "c++14"))
+     (eval setq company-clang-arguments
+           (list "-std=c++14" "-DS_CPLEX"
+                 (concat "-I" root-path "/vendor/tclap/include/")
+                 (concat "-I" root-path "/vendor/tclap-tuple/include/")
+                 "-I/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio1263/concert/include"))
+     (eval set
+           (make-local-variable
+            (quote root-path))
+           (file-name-directory
+            (let
+                ((d
+                  (dir-locals-find-file ".")))
+              (if
+                  (stringp d)
+                  d
+                (car d)))))
+     (company-clang-arguments "-std=c++14" "-DS_CPLEX" "-I/home/mcapelle/Dev/cpp/lns/vendor/rapidjson/include/" "-I/home/mcapelle/Dev/cpp/lns/lib/build/include/" "-I/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio1263/concert/include")
+     (company-clang-arguments "-std=c++14" "-Iinclude")
      (company-clang-arguments "-std=c++14" "-I/home/mcapelle/Dev/cpp/lns/vendor/rapidjson/include/" "-I/home/mcapelle/Dev/cpp/lns/lib/build/include/" "-I/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio1263/concert/include")
      (company-clang-arguments "-std=c++14" "-I/home/mcapelle/Dev/cpp/include/" "-I/home/mcapelle/Dev/cpp/lns/lib/build/include/" "-I/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio1263/concert/include")
      (company-clang-arguments
@@ -31,7 +152,8 @@
      (eval setq clang-args
            ("-std=c++14" "-I/home/mcapelle/Dev/cpp/include/" "-I/home/mcapelle/Dev/cpp/lns/lib/build/include/"))
      (encoding . utf-8)
-     (company-clang-arguments "-std=c++14" "-I/home/mcapelle/Dev/cpp/include/" "-I/home/mcapelle/Dev/cpp/lns/lib/build/include/")))))
+     (company-clang-arguments "-std=c++14" "-I/home/mcapelle/Dev/cpp/include/" "-I/home/mcapelle/Dev/cpp/lns/lib/build/include/"))))
+ '(tab-width 4))
 ;; (custom-set-faces
 ;;  ;; custom-set-faces was added by Custom.
 ;;  ;; If you edit it by hand, you could mess it up, so be careful.