Notifiers + other final changes