Notifications cleaned up even more.  Optimizations galore!