diff --git a/emacs.d/core.el b/emacs.d/core.el
index dae25db..16943c7 100644
--- a/emacs.d/core.el
+++ b/emacs.d/core.el
@@ -39,9 +39,22 @@
 ;; Subword mode
 (global-subword-mode)
 
-;; Enable global line numbers
-(global-linum-mode t)
-
+;; Save place in file
+(save-place-mode 1)
+
+;; Save history
+(setq savehist-additional-variables '(mark-ring
+				      global-mark-ring
+				      search-ring
+				      regexp-search-ring
+				      extended-command-history)
+      savehist-autosave-interval 60
+      enable-recursive-minibuffers t
+      history-length 1000)
+(savehist-mode 1)
+
+;; smart tab behavior - indent or complete
+(setq tab-always-indent 'complete)
 
 ;; Custom functions
 ;; DEV: Load this last
diff --git a/emacs.d/packages.el b/emacs.d/packages.el
index 28930bf..a6f569a 100644
--- a/emacs.d/packages.el
+++ b/emacs.d/packages.el
@@ -13,6 +13,9 @@
   :diminish helm-mode
   :bind (("M-x" . helm-M-x)
 	 ("C-x C-f" . helm-find-files))
+  :init
+  (setq helm-move-to-line-cycle-in-source t
+	helm-M-x-always-save-history t)
   :config
   (use-package helm-ag)
   (helm-mode 1))
diff --git a/emacs.d/theme.el b/emacs.d/theme.el
index 5ca9615..56d19f2 100644
--- a/emacs.d/theme.el
+++ b/emacs.d/theme.el
@@ -1,3 +1,6 @@
 (use-package monokai-theme
   :config
   (load-theme 'monokai t))
+
+;; Enable global line numbers
+(global-linum-mode t)