diff --git a/behaviour.el b/behaviour.el
index 5d34871..12f470c 100644
--- a/behaviour.el
+++ b/behaviour.el
@@ -163,6 +163,7 @@
 
 ;; Show projectile lists by most recently active
 (setq projectile-sort-order (quote recently-active))
+(add-hook 'projectile-after-switch-project-hook 'magit-status)
 
 ;; (add-hook 'projectile-find-file-hook 'projectile-invalidate-cache)
 
diff --git a/spelling.el b/spelling.el
index d85fbef..601bd9a 100644
--- a/spelling.el
+++ b/spelling.el
@@ -6,9 +6,10 @@
 ;; Disable meta on right alt (useful for Polish characters)
 (setq ns-right-alternate-modifier nil)
 
+(require 'ispell)
 ;; Highlight misspelled words
 (setq ispell-program-name "aspell")
-(flyspell-mode 1)
+(add-hook 'prog-mode-hook 'flyspell-mode)
 (provide 'spelling)
 
 ;;; spelling.el ends here
diff --git a/windows.el b/windows.el
index ad2fe15..25af461 100644
--- a/windows.el
+++ b/windows.el
@@ -12,6 +12,7 @@
 (add-to-list 'purpose-user-regexp-purposes '("_spec.rb\\(<.*>\\)?$" . test))
 (add-to-list 'purpose-user-regexp-purposes '("_test.exs\\(<.*>\\)?$" . test))
 (add-to-list 'purpose-user-mode-purposes '(shell-mode . test))
+(add-to-list 'purpose-user-mode-purposes '(magit-diff-mode . test))
 
 ;; Enumarate through all stuff.
 (add-to-list 'purpose-user-regexp-purposes