Notifications Fixes and Final updates