diff --git a/bundle/hooks.el b/bundle/hooks.el
index 381076c7..bdbdb8e0 100644
--- a/bundle/hooks.el
+++ b/bundle/hooks.el
@@ -4,6 +4,7 @@
 (add-hook 'markdown-mode-hook 'turn-on-font-lock)
 (add-hook 'python-mode-hook 'turn-on-font-lock)
 (add-hook 'org-mode-hook 'turn-on-font-lock)
+(add-hook 'org-mode-hook 'turn-on-auto-fill)
 (add-hook 'elpy-mode-hook (lambda () (highlight-indentation-mode -1)))
 (elpy-enable)
 
diff --git a/bundle/org-mode-settings.el b/bundle/org-mode-settings.el
index 181a2c88..385724ed 100644
--- a/bundle/org-mode-settings.el
+++ b/bundle/org-mode-settings.el
@@ -18,6 +18,8 @@
 (org-display-inline-images)
 
 (when (string= (system-name) "EVG02667NB")
+  (setq org-duration-format (quote h:mm)
+        org-babel-python-command "python")
   (when *docs-path*
     (setq org-agenda-files `(,(concat *docs-path* "\\Journal"))
           org-default-notes-file (concat *docs-path* "\\Journal\\notes.org"))))