diff --git a/init/core-editor.el b/init/core-editor.el
index 20c95b59d..e74d31341 100644
--- a/init/core-editor.el
+++ b/init/core-editor.el
@@ -28,7 +28,6 @@
    key-chord               ; for mapping key chords in insert mode
    multiple-cursors		   ; cursors, of the numerous variety
    ediff
-   deferred
    ))
 
 
diff --git a/modules/env-js-mode.el b/modules/env-js-mode.el
index b8a39945f..ef560f717 100644
--- a/modules/env-js-mode.el
+++ b/modules/env-js-mode.el
@@ -4,8 +4,6 @@
 (setq tern-ac-on-dot nil)
 
 ;; replace auto-complete with tern-ac-complete only in js-mode
-(add-hook 'change-major-mode-hook
-		  (lambda () (evil-define-key 'insert ac-mode-map (kbd "C-SPC") 'auto-complete)))
 (add-hook 'js-mode-hook
 		  (lambda ()
 			(evil-define-key 'insert ac-mode-map (kbd "C-SPC") 'tern-ac-complete)
@@ -13,7 +11,6 @@
 			(tern-ac-setup)
 			))
 
-
 ;; Let flycheck handle parse errors
 ;; (setq-default js2-show-parse-errors nil)
 ;; (setq-default js2-strict-missing-semi-warning nil)
diff --git a/modules/mod-ac.el b/modules/mod-ac.el
index 2ae1cf743..11ad6ca82 100644
--- a/modules/mod-ac.el
+++ b/modules/mod-ac.el
@@ -3,13 +3,13 @@
    auto-complete-config    ; its default config
    ))
 
-;; (setq ac-auto-show-menu nil     ; Suggestions box must be invoked manually (see core-keymaps.el)
-;;       ac-use-menu-map t         ; Enable ac-menu-map map when menu is open
-;;       ac-us-quick-help nil      ; Don't show tooltips unless invoked (see core-keymaps.el)
-;;       ac-fuzzy-cursor-color nil)
+(setq ac-auto-show-menu nil     ; Suggestions box must be invoked manually (see core-keymaps.el)
+      ac-use-menu-map t         ; Enable ac-menu-map map when menu is open
+      ac-us-quick-help nil      ; Don't show tooltips unless invoked (see core-keymaps.el)
+      ac-fuzzy-cursor-color nil)
 
 ;; Keep auto-complete quiet until it's needed (see core-keymaps.el)
-(setq ac-auto-start nil)
+(setq ac-auto-start 2)
 
 (ac-config-default)
 (ac-linum-workaround)         	; Fix line number flux bug
@@ -20,13 +20,16 @@
 (add-to-list 'ac-dictionary-directories "~/.emacs.d/ac-dict")
 
 ;; Use more vim-like keymappings
-(evil-define-key 'insert ac-mode-map (kbd "C-SPC") 'auto-complete)
-(evil-define-key 'insert ac-mode-map (kbd "C-S-SPC") 'ac-fuzzy-complete)
-(define-key ac-completing-map (kbd "<tab>") 'ac-next)
-(define-key ac-completing-map (kbd "S-<tab>") 'ac-previous)
+(add-hook 'change-major-mode-hook
+		  (lambda () (evil-define-key 'insert ac-mode-map (kbd "C-SPC") 'auto-complete)))
+
+(evil-define-key 'insert ac-mode-map (kbd "C-S-SPC") 'auto-complete)
+(define-key ac-completing-map (kbd "<tab>") 'ac-expand)
+(define-key ac-completing-map (kbd "C-n") 'ac-next)
+(define-key ac-completing-map (kbd "C-p") 'ac-previous)
 (define-key ac-completing-map (kbd "<F1>") 'ac-quick-help)
-(define-key ac-completing-map [return] 'ac-complete)
 (define-key ac-completing-map (kbd "ESC") 'ac-stop)
+(define-key ac-completing-map [return] nil)
 
 (add-hook 'prog-mode-hook 'enable-path-completion)