Fixes a couple of exceptions
Notifications now works as it says on the box :)