Re-work notifications and fix task error