diff --git a/core/core-evil.el b/core/core-evil.el
index 5c634274a..c69d5d6bb 100644
--- a/core/core-evil.el
+++ b/core/core-evil.el
@@ -51,6 +51,7 @@
   (dolist (mode-map '((cider-repl-mode   . emacs)
                       (comint-mode       . emacs)
                       (term-mode         . emacs)
+                      (Info-mode         . emacs)
                       (help-mode         . normal)
                       (message-mode      . normal)
                       (compilation-mode  . normal)))
diff --git a/core/core-ui.el b/core/core-ui.el
index 27c8f105d..6a0b2349f 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -21,7 +21,7 @@
  hl-line-sticky-flag             nil  ; only highlight in one window
 
  jit-lock-defer-time 0
- jit-lock-stealth-time nil
+ jit-lock-stealth-time 1
 
  resize-mini-windows t)
 
@@ -345,15 +345,15 @@ iedit."
                 (int-to-string length))))
     :face (if active 'mode-line-iedit-face 'mode-line-inactive)
     :skip-alternate t
-    :when (and (featurep 'iedit) (> (length iedit-occurrences-overlays) 0)))
+    :when (and (featurep 'evil-iedit-state) evil-iedit-state-minor-mode))
 
   ;; TODO mode-line-substitute-face default face
-  ;; TODO This is very hackish; refactor?
   (defface mode-line-substitute-face nil "")
+  ;; TODO This is very hackish; refactor?
   (spaceline-define-segment narf-evil-substitute
     "Show number of :s matches in real time."
     (let ((highlights (cdar evil-ex-active-highlights-alist)))
-      (format "%s" (length (elt highlights (1- (length highlights))))))
+      (format "%s matches" (length (elt highlights (1- (length highlights))))))
     :face (if active 'mode-line-substitute-face 'mode-line-inactive)
     :skip-alternate t
     :when (and (evil-ex-p) (string-equal evil-ex-cmd "s")))
diff --git a/core/core.el b/core/core.el
index 2b845715b..449bab503 100644
--- a/core/core.el
+++ b/core/core.el
@@ -13,25 +13,26 @@
 ;;;
 
 (setq-default
+ confirm-kill-emacs (lambda (prompt) (y-or-n-p ">> Gee, I dunno Brain... Are you sure?"))
+
  ad-redefinition-action            'accept      ; silence the advised function warnings
- compilation-always-kill            t
- compilation-ask-about-save         nil
- compilation-scroll-output          t
- confirm-kill-emacs  (lambda (prompt) (y-or-n-p ">> Gee, I dunno Brain... Are you sure?"))
- echo-keystrokes                    0.02        ; show me those keystrokes
- ediff-diff-options                 "-w"
- ediff-split-window-function       'split-window-horizontally   ; side-by-side diffs
- ediff-window-setup-function       'ediff-setup-windows-plain   ; no extra frames
- enable-recursive-minibuffers       nil         ; no minibufferception
+ echo-keystrokes                    0.02        ; show me what I type
  history-length                     1000
- inhibit-startup-echo-area-message  "hlissner"  ; username shuts up emacs
- inhibit-startup-screen             t           ; don't show emacs start screen
- initial-major-mode                'text-mode   ; initial scratch buffer mode
- initial-scratch-message            nil
- major-mode                        'text-mode
  ring-bell-function                'ignore      ; silence of the bells!
  save-interprogram-paste-before-kill nil
  sentence-end-double-space          nil
+ enable-recursive-minibuffers       nil         ; no minibufferception
+ compilation-always-kill            t           ; kill compilation process before spawning another
+ compilation-ask-about-save         nil         ; save all buffers before compiling
+ compilation-scroll-output          t           ; scroll with output while compiling
+ ediff-diff-options                 "-w"
+ ediff-split-window-function       'split-window-horizontally   ; side-by-side diffs
+ ediff-window-setup-function       'ediff-setup-windows-plain   ; no extra frames
+ inhibit-startup-echo-area-message  "hlissner"  ; username shuts up emacs
+ inhibit-startup-screen             t           ; don't show emacs start screen
+ initial-scratch-message            nil
+ initial-major-mode                'text-mode   ; initial scratch buffer mode
+ major-mode                        'text-mode
 
  ;; http://ergoemacs.org/emacs/emacs_stop_cursor_enter_prompt.html
  minibuffer-prompt-properties '(read-only t point-entered minibuffer-avoid-prompt face minibuffer-prompt)
@@ -40,13 +41,12 @@
  eval-expression-print-length       nil
  eval-expression-print-level        nil
 
- ;; Disable all backups (that's what git/dropbox are for)
  bookmark-save-flag                 t
  bookmark-default-file              (concat narf-temp-dir "bookmarks")
+
+ ;; Disable all backups (that's what git/dropbox are for)
  auto-save-default                  nil
  auto-save-list-file-name           (concat narf-temp-dir "autosave")
-
- ;; In case I want to reactivate backup files
  make-backup-files                  nil
  create-lockfiles                   nil
  backup-directory-alist            `((".*" . ,(concat narf-temp-dir "backup/")))
diff --git a/core/lib/defuns-quickrun.el b/core/lib/defuns-quickrun.el
index 508d37134..536b8f1dc 100644
--- a/core/lib/defuns-quickrun.el
+++ b/core/lib/defuns-quickrun.el
@@ -29,6 +29,7 @@ If ARG is nil this function calls `recompile', otherwise it calls
 ;;;###autoload (autoload 'narf:eval-buffer "defuns-quickrun" nil t)
 (evil-define-command narf:eval-buffer ()
   :move-point nil
+  :repeat nil
   (interactive)
   (cond ((eq major-mode 'emacs-lisp-mode)
          (narf:eval-region (point-min) (point-max)))
@@ -37,6 +38,7 @@ If ARG is nil this function calls `recompile', otherwise it calls
 ;;;###autoload (autoload 'narf:eval-region "defuns-quickrun" nil t)
 (evil-define-operator narf:eval-region (beg end)
   :move-point nil
+  :repeat nil
   (interactive "<r>")
   (cond ((eq major-mode 'emacs-lisp-mode)
          (let* ((pp-escape-newlines nil)