diff --git a/core/core-company.el b/core/core-company.el
index c8d8406f1..0de005b42 100644
--- a/core/core-company.el
+++ b/core/core-company.el
@@ -5,9 +5,7 @@
 
 (use-package company
   :diminish (company-mode . "=")
-  :commands (company-complete-common company-files company-tags
-             company-ispell company-yasnippet company-semantic
-             company-dabbrev-code)
+  :commands global-company-mode
   :init
   (after! abbrev (diminish 'abbrev-mode "A"))
   (setq company-idle-delay nil
@@ -24,9 +22,8 @@
                             company-echo-metadata-frontend
                             company-preview-if-just-one-frontend)
         company-dict-dir (concat narf-private-dir "dict/"))
+  (add-hook! after-init 'global-company-mode)
   :config
-  (global-company-mode +1)
-
   ;; (use-package company-dict :defer t)
   ;; (setq-default company-backends (append '(company-dict company-keywords) company-backends))
 
diff --git a/core/core-project.el b/core/core-project.el
index e837ca605..1b805a388 100644
--- a/core/core-project.el
+++ b/core/core-project.el
@@ -24,7 +24,7 @@
   (add-to-list 'ido-ignore-files "\\`.DS_Store$")
   (add-to-list 'ido-ignore-files "Icon\\?$")
   (add-hook! ido-setup
-    (bind! :map (ido-completion-map ido-file-completion-map)
+    (bind! :map (ido-common-completion-map ido-completion-map ido-file-completion-map)
            "C-n" 'ido-next-match
            "C-p" 'ido-prev-match
            "C-w" 'ido-delete-backward-word-updir))
diff --git a/core/core-ui.el b/core/core-ui.el
index 2eb9d342e..8dadc3d83 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -122,8 +122,8 @@
          sml/pre-modes-separator       " : "
          sml/pre-minor-modes-separator " "
          sml/pos-minor-modes-separator ": "
-         sml/replacer-regexp-list '(("^~/Dropbox/Projects/" "PROJECTS:")
-                                    ("^~/.emacs.d/" "EMACS.D:")
+         sml/replacer-regexp-list '(("^~/.emacs.d/" "EMACS.D:")
+                                    ("^~/Dropbox/Projects/" "PROJECTS:")
                                     ("^~/Dropbox/notes/" "NOTES:")
                                     ("^/usr/local/Cellar/" "HOMEBREW:")))
   :config
diff --git a/core/core.el b/core/core.el
index 32930dec9..5310372a8 100644
--- a/core/core.el
+++ b/core/core.el
@@ -34,7 +34,7 @@
   (require 'dash)
   (require 'f)
 
-  (setq use-package-verbose narf-debug-mode)
+  (defvar use-package-verbose narf-debug-mode)
   ;; (setq use-package-expand-minimally (not narf-debug-mode))
   (require 'use-package)
 
@@ -185,7 +185,11 @@
 
 (use-package popwin :config (popwin-mode 1))
 
-(use-package server :config (unless (server-running-p) (server-start)))
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(require 'server)
+(unless (server-running-p)
+  (server-start))
 
 (provide 'core)
 ;;; core.el ends here
diff --git a/core/lib/defuns-quickrun.el b/core/lib/defuns-quickrun.el
index fbaef2e03..fd6120170 100644
--- a/core/lib/defuns-quickrun.el
+++ b/core/lib/defuns-quickrun.el
@@ -1,6 +1,7 @@
 ;;; defuns-quickrun.el
 
 ;;;; Code building ;;;;;;;;;;;;;;;;;;;;;;
+;;;###autoload
 (defvar narf--build-command '("make %s" . "Makefile"))
 (make-variable-buffer-local 'narf--build-command)
 
diff --git a/init-load-path.el b/init-load-path.el
index f94e16a8e..b589d0724 100644
--- a/init-load-path.el
+++ b/init-load-path.el
@@ -9,6 +9,7 @@
 (defconst narf-private-dir   (! (concat narf-emacs-dir "private/")))
 (defconst narf-elpa-dir      (! (concat narf-emacs-dir ".cask/" emacs-version "/elpa/")))
 (defconst narf-temp-dir      (! (concat narf-private-dir "cache/" (system-name) "/")))
+(defconst narf-script-dir    (! (concat narf-emacs-dir "scripts/")))
 (defconst narf-snippet-dirs  (! (list (concat narf-private-dir "snippets/")
                                       (concat narf-private-dir "templates/"))))