Fixes, rewritten Notification