diff --git a/modules/module-cc.el b/modules/module-cc.el
index c1557a4af..489c2a00c 100644
--- a/modules/module-cc.el
+++ b/modules/module-cc.el
@@ -8,10 +8,7 @@
     (add-company-backend! cmake-mode (cmake yasnippet))))
 
 (use-package glsl-mode
-  :mode (("\\.glsl\\'" . glsl-mode)
-         ("\\.vert\\'" . glsl-mode)
-         ("\\.frag\\'" . glsl-mode)
-         ("\\.geom\\'" . glsl-mode)))
+  :mode ("\\.glsl\\'" "\\.vert\\'" "\\.frag\\'" "\\.geom\\'"))
 
 (use-package cc-mode
   :defines (c-syntactic-context)
@@ -23,9 +20,8 @@
               c-backward-sws c-determine-limit c-beginning-of-decl-1)
   :commands (c-mode c++-mode objc-mode java-mode)
   :init
-  (associate! c++-mode  :match "\\.h$")
   (associate! objc-mode :match "\\.mm$")
-  (add-hook! (c-mode c++-mode) 'flycheck-mode)
+  (add-hook! (c-mode c++-mode) '(flycheck-mode 'narf|init-c/c++-settings))
   :config
   (setq c-basic-offset 4
         c-tab-always-indent nil
@@ -44,7 +40,6 @@
       (add-company-backend! c++-mode  (c-headers clang))
       (add-company-backend! objc-mode (c-headers xcode)))
 
-    (add-hook! (c-mode c++-mode) 'narf|init-c/c++-settings)
     (add-hook! c++-mode 'narf|init-c++-C11-highlights)
     (add-hook! c++-mode (setq flycheck-clang-language-standard "c++11"
                               flycheck-clang-standard-library  "libc++"))
diff --git a/modules/module-csharp.el b/modules/module-csharp.el
index b2e4372d5..736746161 100644
--- a/modules/module-csharp.el
+++ b/modules/module-csharp.el
@@ -5,13 +5,18 @@
   :mode "\\.cs$"
   :init (add-hook! csharp-mode 'flycheck-mode))
 
+;; unity shaders
+(use-package shaderlab-mode :mode "\\.shader$")
+
 (use-package omnisharp
   :after csharp-mode
-  :init (add-hook! csharp-mode '(emr-initialize omnisharp-mode))
-  :config
-  (setq omnisharp-server-executable-path
-        "~/Dropbox/lib/omnisharp-server/OmniSharp/bin/Debug/OmniSharp.exe"
+  :preface
+  (setq omnisharp-server-executable-path "~/Dropbox/lib/omnisharp-server/OmniSharp/bin/Debug/OmniSharp.exe"
         omnisharp-auto-complete-want-documentation nil)
+  :if (file-exists-p omnisharp-server-executable-path)
+  :init
+  (add-hook! csharp-mode '(emr-initialize omnisharp-mode))
+  :config
 
   (bind! :map omnisharp-mode-map
          :n "gd" 'omnisharp-go-to-definition
@@ -45,8 +50,5 @@
           (show-overloads-at-point                     "show overloads at point")
           (recompile                                   "recompile"))))
 
-;; unity shaders
-(use-package shaderlab-mode :mode "\\.shader$")
-
 (provide 'module-csharp)
 ;;; module-csharp.el ends here
diff --git a/modules/module-go.el b/modules/module-go.el
index c067c67a6..751c5804d 100644
--- a/modules/module-go.el
+++ b/modules/module-go.el
@@ -4,7 +4,7 @@
   :mode "\\.go$"
   :interpreter "go"
   :init
-  (add-hook! go-mode '(emr-initialize flycheck-mode))
+  (add-hook! go-mode '(emr-initialize flycheck-mode narf|enable-tabs narf|enable-tab-width-4))
   :config
   (define-builder! go-mode "go build")
   (bind! :map go-mode-map
diff --git a/modules/module-org.el b/modules/module-org.el
index a80b6f178..653feef62 100644
--- a/modules/module-org.el
+++ b/modules/module-org.el
@@ -1,5 +1,7 @@
 ;;; module-org.el
 
+(defvar org-directory "~/Dropbox/notes/")
+
 (define-minor-mode evil-org-mode
   "Evil-mode bindings for org-mode."
   :init-value nil
@@ -8,7 +10,6 @@
   :group      'evil-org)
 
 (use-package org
-  :defines   (org-directory)
   :functions (org-bookmark-jump-unhide outline-next-heading org-end-of-subtree
               outline-flag-region org-remove-inline-images org-display-inline-images
               org-at-item-checkbox-p org-toggle-checkbox org-entry-is-todo-p org-todo
@@ -31,7 +32,6 @@
     (after! org-indent (diminish 'org-indent-mode))
     (after! iimage     (diminish 'iimage-mode))
 
-    (setq org-directory "~/Dropbox/notes/")
     (setq org-project-directory  (! (concat org-directory "projects")) ; not an org var
           org-default-notes-file (! (concat org-directory "notes.org"))
           org-agenda-files (f-entries org-directory 'narf--org-all-files t)
@@ -139,9 +139,9 @@
 
              :i "C-e"          'org-end-of-line
              :i "C-a"          'org-beginning-of-line
-             :i ;; Add new header line before this line
+             ;; Add new header line before this line
              :i "<S-M-return>" 'narf/org-insert-item-before
-             :i ;; Add new header line after this line
+             ;; Add new header line after this line
              :i "<M-return>"   'narf/org-insert-item-after
 
              :i "M-b" (λ (narf/org-surround "*"))     ; bold
@@ -154,19 +154,19 @@
              :v "M-i" "S/"
              :v "M-`" "S+"
 
-             (:prefix ","
-               :n "=" 'org-align-all-tags
-               :n "/" 'org-sparse-tree
-               :n "?" 'org-tags-view
-               :n "a" 'org-attach
-               :n "D" 'org-time-stamp-inactive
-               :n "T" 'org-show-todo-tree
-               :n "d" 'org-time-stamp
-               :n "r" 'org-refile
-               :n "s" 'org-schedule
-               :n "t" 'org-todo
-               :n "SPC" 'narf/org-toggle-checkbox
-               :n "<return>" 'org-archive-subtree)
+             :n ",=" 'org-align-all-tags
+             :n ",/" 'org-sparse-tree
+             :n ",?" 'org-tags-view
+             :n ",a" 'org-attach
+             :n ",D" 'org-time-stamp-inactive
+             :n ",T" 'org-show-todo-tree
+             :n ",d" 'org-time-stamp
+             :n ",r" 'org-refile
+             :n ",s" 'org-schedule
+             :n ",t" 'org-todo
+             :n ",SPC" 'narf/org-toggle-checkbox
+             :n ",<return>" 'org-archive-subtree
+
              :n "gr" 'org-babel-execute-src-block-maybe
              :m "gh" 'outline-up-heading
              :m "gj" 'org-forward-heading-same-level
diff --git a/modules/module-rust.el b/modules/module-rust.el
index 78957ad23..1eaf8da76 100644
--- a/modules/module-rust.el
+++ b/modules/module-rust.el
@@ -12,6 +12,7 @@
   :mode "\\.rs$"
   :config
   (define-builder! rust-mode "cargo run" "Cargo.toml")
+
   (use-package flycheck-rust
     :config (add-hook! rust-mode 'flycheck-mode))
 
@@ -21,12 +22,8 @@
     (setq racer-cmd "/usr/local/bin/racer"
           racer-rust-src-path "~/Dropbox/lib/rust/src/")
 
-    (add-company-backend! rust-mode (racer))
-
-    (add-hook! rust-mode
-      (racer-activate)
-      (racer-turn-on-eldoc)
-      (add-hook! flycheck-mode 'flycheck-rust-setup))))
+    (add-hook! rust-mode '(racer-mode eldoc-mode flycheck-rust-setup))
+    (add-company-backend! rust-mode (racer))))
 
 (provide 'module-rust)
 ;;; module-rust.el ends here