Notification improvements

Closes #58