Work on Notification Triggers and a bit of housekeeping.