diff --git a/init.el b/init.el
index f54e607..c0f5086 100644
--- a/init.el
+++ b/init.el
@@ -201,6 +201,8 @@
 	(setq org-agenda-include-diary t)
 	;Ensure done date/closed timestamps are logged
 	(setq org-log-done 'time)
+	;Ensure state changes are logged into logbook
+	(setq org-log-into-drawer "LOGBOOK")
 
 	;Ensure agenda still shows DONE items
 	(setq org-agenda-skip-scheduled-if-done nil)
@@ -241,6 +243,10 @@
 	:ensure t
 	:after org
 	:config
+		(setq org-alert-headline-regexp "TODO\\|WAITING")
+		(setq org-agenda-skip-scheduled-if-done t)
+		(setq org-agenda-skip-deadline-if-done t)
+
 		(alert-define-style 'custom-org-alert-notification
 			:title "Custom Notification"
 			:notifier