Timeout on notifications
Tweaked some