working on the notifications
working on the fixes from Clayton