Minor refactor, notifications, dates