Reduced likelihood of deadlocks in modify data
Added ability to edit notifications.